player animation
Merge branch 'master' of https://github.com/ericslee/MineShaft

Conflicts:
	Assets/Scripts/GameManager.cs