Fixed bug.

Menu is fully functional
Merge branch 'Gui-first'

Conflicts:
	GuiApp1.java