#3 gameOver
Merge branch 'master' of https://github.com/jaeyz/TC_Prototype

Conflicts:
	TCPrototype/Assets/Scenes/Game.unity