Combo box functionality should be working to an extent. Made changes to some guiwindows making them easier to read and more organized.
Merge github.com:CS3141-Team-Software/Programmander

Conflicts:
	gameEngine/GameEngine.java