Merge branch 'master' of https://github.com/RavenNevermore/EndOfLine

Conflicts:
	GridForce/Assets/Prefabs/GameState.prefab