Updated the options, still doesnt work but will finish later
Merge branch 'master' of https://github.com/AstronautG117/RobotWestern

Conflicts:
	Shooty/Library/ScriptAssemblies/Assembly-CSharp.dll
	Shooty/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Shooty/Library/assetDatabase3
	Shooty/Shooty-csharp.sln
	Shooty/Shooty.sln
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/metadata/0d/0d3bc428942f3444b94880540ada6b1c
	Shooty/Shooty-csharp.sln
	Shooty/Shooty.sln
	Shooty/Shooty.userprefs