Alex's Level
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project3/Assembly-CSharp-vs.csproj
	Project3/Assembly-CSharp.csproj
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/InspectorExpandedItems.asset
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/assetDatabase3
	Project3/Library/expandedItems
	Project3/Library/guidmapper
	Project3/Library/metadata/00/0000000000000000b000000000000000
	Project3/Library/metadata/13/1357bad4104e49440a194ebd5a02a98b
	Project3/Library/metadata/1a/1a5c8d9d9500f3a4a89907a5d8af197d
	Project3/Library/metadata/44/444136cd6a798af4a90a681767dd8fe9
	Project3/Library/metadata/70/70e522ea27606f3478c9765a3c0eec82
	Project3/Library/metadata/85/85ac713adf4728b48b82a62a8ce0e681
	Project3/Library/metadata/b4/b4f3771578b1cc042a892835af05c176
	Project3/Library/metadata/c3/c3abe0c7ab9d5e04887e3ee3c41e31da
	Project3/Project3-csharp.sln
	Project3/Project3.sln
	Project3/Project3.userprefs