ToonShaderAlpha
Merge branch 'master' of https://github.com/kyledobitz/YouAreAnApartment

Conflicts:
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Library/AssetServerCacheV3
	Unity Project/Library/CurrentLayout.dwlt
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity Project/Library/ScriptMapper
	Unity Project/Library/assetDatabase3
	Unity Project/Library/guidmapper
	Unity Project/Library/metadata/11/11fc71b8113727f46af966f3b253719a
	Unity Project/Library/metadata/1e/1e4d7b5a4d1c31943b692b355f375c2d
	Unity Project/Library/metadata/44/445324c86f29e6343b4e59ed21ce554d
	Unity Project/Library/metadata/7a/7ab4d7f1a03f74e4aab15b107e6401a2
	Unity Project/Library/metadata/9b/9b2dcd114a0596b4b802f0cf4c2765ff
	Unity Project/Library/metadata/a7/a78ad473df9d51548a7bde49b4631aee
	Unity Project/Library/shadercompiler-1.log
	Unity Project/Temp/__EditModeScene
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln