Merge branch 'develop' into JackySprint11
light and heavy ranged cleans added
Merge branch 'dylanSprint10' into JackySprint11

Conflicts:
	UnityProject/Assets/Resources/AnimatorController/MainCharacter.controller
udpated player character animations and animator
Merge pull request #139 from jackykschou/JackySprint11

Jacky sprint11