my stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	mainproject/Assembly-CSharp-vs.csproj
	mainproject/Assembly-CSharp.csproj
	mainproject/Assets/main.unity
	mainproject/Library/CurrentLayout.dwlt
	mainproject/Library/InspectorExpandedItems.asset
	mainproject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	mainproject/Library/assetDatabase3
	mainproject/Library/expandedItems
	mainproject/Library/guidmapper
	mainproject/Library/shadercompiler-1.log
	mainproject/mainproject-csharp.sln
	mainproject/mainproject.sln
	mainproject/mainproject.userprefs