fixes and stuff
Merge branch 'master' of https://github.com/ZavaStudios/SeniorCapstone

Conflicts:
	Assets/Prefabs/skeleton.prefab
	Assets/Scripts/UnitPlayerScripts/UnitPlayer.cs