Working gui changes
Merge branch 'master' into gameWindowGUI

Conflicts:
	game/src/display/Display.java
	game/src/display/GamePanel.java