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

Conflicts:
	Assets/Resources/Troll.prefab
	Assets/Resources/TrollNoControle.prefab