tweaked
Merge branch 'master' of github.com:austinhulse/SpaceGame

Conflicts:
	SpaceGame/GameState.h