Beginning of gold collection phase
Updated names of Creatures
merge stuff
Merge branch 'master' into mvp-opt1

Conflicts:
	KingNThings/src/com/model/Cup.java
	KingNThings/src/com/model/game/Game.java
	KingNThings/src/com/view/GameScreen.java