needless
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerGuirdner/Assembly-CSharp-vs.csproj
	TowerGuirdner/Assembly-CSharp.csproj
	TowerGuirdner/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
	TowerGuirdner/Library/AssetServerCacheV3
	TowerGuirdner/Library/CurrentLayout.dwlt
	TowerGuirdner/Library/ScriptAssemblies/Assembly-CSharp.dll
	TowerGuirdner/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	TowerGuirdner/Library/ScriptMapper
	TowerGuirdner/Library/UnityAssemblies/UnityEditor.dll
	TowerGuirdner/Library/UnityAssemblies/UnityEngine.dll
	TowerGuirdner/Library/UnityAssemblies/version.txt
	TowerGuirdner/Library/assetDatabase3
	TowerGuirdner/Library/guidmapper
	TowerGuirdner/Library/metadata/00/00000000000000006100000000000000
	TowerGuirdner/Library/metadata/84/848e08f7cf2337f49a54945ba7f8717f
	TowerGuirdner/TowerGuirdner-csharp.sln
	TowerGuirdner/TowerGuirdner.sln
	TowerGuirdner/UnityVS.TowerGuirdner.CSharp.csproj