changes that won't be changes
Hopefully that merge conflict is fixed.  Also, guy should be able to run left now.
Merge branch 'master' of https://github.com/wallacet/HorrorWonderLand-GJ-11-14

Conflicts:
	Assets/Scripts/CharacterControllerScript.cs