fixed layout of the GameScreen
Merge branch 'master' of github.com:katherineng/terrace

Conflicts:
	src/terrace/gui/GameScreen.java