Merge branch 'master' into chrisDev
Player animation
Merge branch 'chrisDev'
Merge branch 'master' into zacDev

Conflicts:
	Assets/Scripts/Player.cs