Finished map
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Assembly-CSharp-vs.csproj
	New Unity Project/Assets/Scen 1.unity
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/CurrentMaximizeLayout.dwlt
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/5b/5b135dc382e72e647893855e70783134
	New Unity Project/New Unity Project-csharp.sln
	New Unity Project/New Unity Project.sln
	New Unity Project/New Unity Project.userprefs