I don't care anymore
Merge branch 'master' of https://github.com/johnnywendy/SPAAACE

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/bd/bdaadfa3b248342aaadc22a96128fe89
	Library/metadata/c5/c5d0cd2eb8cae44e3b0380c96476c3b1
	Library/metadata/e8/e867ccef190a64cfb923cd4421c324af
	SPAAACE-csharp.sln
	SPAAACE.sln
	SPAAACE.userprefs
	Temp/__EditModeScene