CHG: Readded GameStateHandler.cs changes.
Merge branch 'master' of https://github.com/daniel-cheng/stellar

Conflicts:
	Stellar/Assets/Scripts/GameStateHandler.cs
	Stellar/Assets/Scripts/GameStateHandler.cs.meta