Changed the menu grid layout
Merge branch 'menu' of https://github.com/psmagicman/think-global-hack-local into menu
Merged Doug's stuff
Conflicts:
	src/gui/mainGUI.java