hit code
Merge branch 'master' of https://github.com/proudaut/GGJ

Conflicts:
	Assets/Script/GameManager.cs