For pull
Merge branch 'master' of github.com:TENFIRE/GreedGame
Merge branch 'master' of github.com:TENFIRE/GreedGame

Conflicts:
	src/GUI/PostGamePanel.java