misc changes
Merge branch 'master' of git@github.com:ChevyRay/TruffleHunters.git

Conflicts:
	Assembly-CSharp-Editor.pidb
	Assembly-CSharp.pidb
	Assets/Scenes/GeneratedScene.unity