eh
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Assets/Scen 1.unity
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/CurrentMaximizeLayout.dwlt
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/New Unity Project-csharp.sln
	New Unity Project/New Unity Project.sln
Merge branch 'master' of https://github.com/m-u-a-c/a-vital-quest

Conflicts:
	New Unity Project/Assembly-CSharp-vs.csproj
	New Unity Project/Assembly-CSharp.csproj
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/CurrentMaximizeLayout.dwlt
	New Unity
Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	New Unity
Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity
Project/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	New Unity
Project/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/00/00000000000000003000000000000000
	New Unity Project/Library/metadata/00/00000000000000006100000000000000
	New Unity Project/Library/metadata/00/00c867a34e22db745a768399d42f3b8d
	New Unity Project/Library/metadata/03/03d50f4e54390f742ab613f4513936d3
	New Unity Project/Library/metadata/0f/0f2f7f44b095c964781cae17b1ab84d5
	New Unity Project/Library/metadata/10/10083625944f1a64e8e9dea07a37d9e7
	New Unity Project/Library/metadata/34/34ce2b21e4311fe459426457debb639d
	New Unity Project/Library/metadata/3a/3a66a161bb6ccac42aa6f8e7e1172ee9
	New Unity Project/Library/metadata/40/409bced12a8df7346a54baf61ef5f229
	New Unity Project/Library/metadata/41/411ae62d8d3aa5847b216f3e547d0005
	New Unity Project/Library/metadata/4c/4cdb033a6f4834a41a64fc354decf3ae
	New Unity Project/Library/metadata/57/5730e0b15f898a34f80f5d62068b986a
	New Unity Project/Library/metadata/5e/5e3c1aec68812de45a3a58f7ba4a27cf
	New Unity Project/Library/metadata/71/71608f79bcd39fc42ab9a201a1fc1734
	New Unity Project/Library/metadata/85/855298deef1284f4eabcc3f895d2e353
	New Unity Project/Library/metadata/db/db3b262a5654a924abedaac7f9a25f58
	New Unity Project/Library/metadata/db/db640a680202fdb42b9b904814e8e261
	New Unity Project/Library/metadata/f7/f7238e4d540007e4888db2b2e8992e73
	New Unity Project/Library/metadata/fd/fd86c6cf3a3f15644a06fd654bff05bf
	New Unity Project/New Unity Project-csharp.sln
	New Unity Project/New Unity Project.sln
	New Unity Project/New Unity Project.userprefs