Wip animation
Merge branch 'master' of https://github.com/jyapayne/DemonShanker2

Conflicts:
	Assets/Audio/beneath-surface-4.ogg.meta
	Assets/Scripts/PlayerController.cs
Mecanim homeless animation