hit/hited WIP
Merge branch 'master' of github.com:proudaut/GGJ

Conflicts:
	Assets/Resources/Goblin.prefab
	Assets/Resources/GoblinNoControle.prefab
	Assets/Scene/Game.unity