Finished many screens, gameover, trading, and transfered all the logic
into player
Merge remote-tracking branch 'origin/John'

Conflicts:
	Group-project/src/control/Player.java
	Group-project/src/gameworld/Container.java
	Group-project/src/ui/GameFrame.java