Problem: displaying gamestage incorrectly, still
Overlapping problem, still
Displaying problem solved:
	in order to get setBound works, need to setLayout(null)
Merge remote-tracking branch 'origin/master'

Conflicts:
	workspace/Assignment3/bin/game/Game.class
	workspace/Assignment3/bin/game/GameStage.class
	workspace/Assignment3/src/game/Game.java
	workspace/Assignment3/src/game/GameStage.java