Implemented Inventory, is not working yet
Merge branch 'master' of https://github.com/AstronautG117/RobotWestern

Conflicts:
	Shooty/Assembly-CSharp-vs.csproj
	Shooty/Assembly-CSharp.csproj
	Shooty/Assembly-CSharp.pidb
	Shooty/Assets/test.unity
	Shooty/Library/ScriptAssemblies/Assembly-CSharp.dll
	Shooty/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Shooty/Library/assetDatabase3
	Shooty/Library/guidmapper
	Shooty/Library/metadata/42/424bc47f3431145e29d21aa8175341fb
	Shooty/Library/metadata/50/50db6abd75da3473c81a237b663795ea
	Shooty/Library/metadata/72/72120186d9731294ba18a94259a6ae05
	Shooty/Shooty-csharp.sln
	Shooty/Shooty.sln
	Shooty/Shooty.userprefs