No wait, this is important

...
Merge branch 'master' of https://github.com/Method382/CosmicEncounters

Conflicts:
	JEncounters/src/encounters/game/common/GameState.java