bug fix
Merge branch 'master' of https://github.com/AstronautG117/RobotWestern

Conflicts:
	Shooty/Assembly-CSharp.pidb
	Shooty/Library/ScriptAssemblies/Assembly-CSharp.dll
	Shooty/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Shooty/Library/assetDatabase3
	Shooty/Library/expandedItems
	Shooty/Shooty-csharp.sln
	Shooty/Shooty.sln
	Shooty/Shooty.userprefs