Makin' sound connections
Merge branch 'master' of https://github.com/nickjbenson/TheLittleThings

Conflicts:
	Assets/Scenes/Office Fight Scene.unity
	Assets/Scripts/CombatScript.cs