Changes on desktop

I'm not sure what it wants to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spooks/Assembly-CSharp-vs.csproj
	Spooks/Assembly-CSharp.csproj
	Spooks/Assets/NewBehaviourScript.cs.meta
	Spooks/Assets/RED.jpg.meta
	Spooks/Library/ScriptAssemblies/Assembly-CSharp.dll
	Spooks/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Spooks/Library/assetDatabase3
	Spooks/Library/guidmapper
	Spooks/Library/metadata/17/177ceeff4dcd1c346a766a503ad785ab
	Spooks/Library/metadata/7b/7b1869cb47e432644b769afbe712ab71
	Spooks/Library/metadata/9f/9f9c332200bb4ac42bbe679a172f7a14
	Spooks/Spooks-csharp.sln
	Spooks/Spooks.sln
	Spooks/Spooks.userprefs