Bug Fixes, Audio Added
conflict resolved
conflicts resolved
Merge branch 'master' of https://github.com/code-11/Shadow_Cannibal_Resort

Conflicts:
	ShadowCannibalResort.gmx/ShadowCannibalResort.project.gmx