sound updates
sound updates
Merge branch 'master' of https://github.com/mmoy92/Grim

Conflicts:
	Assets/Scripts/MeleeSwipe.cs
	Assets/Scripts/PlayerCombat.cs