Changing GameState around
Merge branch 'controllers' of https://github.com/Tadimsky/vooga into controllers

Conflicts:
	src/vooga/rts/player/HumanPlayer.java
	src/vooga/rts/state/GameState.java
Merge branch 'controllers' of https://github.com/Tadimsky/vooga into controllers