minor tweaks
Merge branch 'menu' of https://github.com/psmagicman/think-global-hack-local into menu

Conflicts:
	src/gui/MainMenu.java