Interacting with other programmers is hard
Merge branch 'master' of https://github.com/AstronautG117/RobotWestern

Conflicts:
	Shooty/Assembly-CSharp-vs.csproj
	Shooty/Assembly-CSharp.csproj
	Shooty/Assembly-CSharp.pidb
	Shooty/Library/ScriptAssemblies/Assembly-CSharp.dll
	Shooty/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Shooty/Library/assetDatabase3
	Shooty/Library/expandedItems
	Shooty/Library/metadata/1d/1d16bcd7a198d134b92cdafd72425d29
	Shooty/Library/metadata/30/3045cccdd4b86854297678dbb18ed382
	Shooty/Library/metadata/37/37a0bd6a01c861640a62ef743a9360ce
	Shooty/Library/metadata/51/51c3f76674beeaa4b96d706691a86344
	Shooty/Library/metadata/7f/7fa6279b6be98b34388c560d59a34f54
	Shooty/Library/metadata/97/975fd3d629c462347914cd313aebffdf
	Shooty/Library/metadata/b2/b2c72031397b2694caa64dae6f581933
	Shooty/Library/metadata/b6/b69f297d7b01449429716cfcf32162a4
	Shooty/Library/metadata/b7/b7256aabc747b8a4ea3a3f457551beb5
	Shooty/Library/metadata/ce/ce6ef54341d5c495f9b4c53bc5bc09c9
	Shooty/Library/metadata/d3/d39143ad5bc686e45a794f5f8a5de69e
	Shooty/Shooty-csharp.sln
	Shooty/Shooty.sln
	Shooty/Shooty.userprefs