Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	gui/second_page.py
#	main.py

gui/second_page.py

@@ -43,10 +43,16 @@ class SecondPage(wx.Frame):
 
     # Virtual event handlers, overide them in your derived class
     def lab1(self, event):
+<<<<<<< HEAD
         from labs.lab1 import lab1
         nex_page = lab1.MainFrame()
         nex_page.Show()
         self.Destroy()
+=======
+        from lab1 import lab1
+        nex_page = lab1.MainFrame()
+        nex_page.Show()
+>>>>>>> origin/dev
 
 
 app = wx.App(False)