Better player character
Merge branch 'chrisDev'
Merge branch 'master' into zacDev

Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Player.prefab.meta
	Assets/Scenes/Testing/Testing.unity