Fixed the bug with getAction in the GameState objects

Now it works sort of.
Merge branch 'gameloop' of https://github.com/maharlikans/riskybusiness into gameloop

Conflicts:
	RiskyBusinessProject/RiskyBusiness/RiskyBusiness.iml

	RiskyBusinessProject/RiskyBusiness/src/main/java/com/slothproductions/riskybusiness/model/GameStates/NormalGameState.java