Updated player prefabs

Figuring out runtime stance error
*Temporary* stance error fix
Conflict fix
Merge with chris master
Fixed conflicts #1
Merge branch 'chris_temp' into Chris_Master

Conflicts:
	BuzzBreakerDemo/Assets/Gameplay Prefabs/Player1.prefab
	BuzzBreakerDemo/Assets/Gameplay Prefabs/Player2.prefab
	BuzzBreakerDemo/Assets/Scenes/BasicStage.unity