I don't know what i did
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/Assembly-CSharp-firstpass-vs.csproj
	DungerMan/Assembly-CSharp-firstpass.csproj
	DungerMan/Assembly-CSharp-vs.csproj
	DungerMan/Assembly-CSharp.csproj
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/AssetServerCacheV3
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/ScriptMapper
	DungerMan/Library/assetDatabase3
	DungerMan/Library/expandedItems
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/04/047330f39d11745ad0004adb8d76c639
	DungerMan/Library/metadata/0e/0e472626a86114ddbb03a3503e7a41db
	DungerMan/Library/metadata/12/12766203c86704c0dac408564c41a1d9
	DungerMan/Library/metadata/28/280d9dce856344832bd7d4a0012552cd
	DungerMan/Library/metadata/2e/2e46f1283b6e74c2abc29b7891661bef
	DungerMan/Library/metadata/30/30abebfd9bf1c49d8a2d26e61e66bc15
	DungerMan/Library/metadata/33/33a20f051444843f6a0085a7650bb548
	DungerMan/Library/metadata/33/33b356d8473df4b0787fb7a1ee334185
	DungerMan/Library/metadata/35/357aa8c2dc5144564ad7fa536dda9764
	DungerMan/Library/metadata/48/48661fa8a4eb4440a828d65492e77732
	DungerMan/Library/metadata/51/518562391f7e446f5a25baf9c4554338
	DungerMan/Library/metadata/52/52b7d70b1de7c4ce09662b77c14d9fda
	DungerMan/Library/metadata/58/58e58844da84d409fbc8b7558a26895f
	DungerMan/Library/metadata/59/593c5099f7dd24e65888f4e8758f64d7
	DungerMan/Library/metadata/63/632990c2014d84723bcaf27726c380b4
	DungerMan/Library/metadata/66/66a6e122337db4059841938101c5ee41
	DungerMan/Library/metadata/67/674c0eb2cf536465fae11fb0f59c3b73
	DungerMan/Library/metadata/69/6909f265f6ca6482abf6a5d3e0f9f165
	DungerMan/Library/metadata/6b/6b6c8946b5d9246a68c73635dcdbada7
	DungerMan/Library/metadata/6c/6c8cccf3e84a844f49be7a7e9078d1c3
	DungerMan/Library/metadata/6f/6f2d407ff7a0441eab996b9f9b1d2e67
	DungerMan/Library/metadata/6f/6f420caf187534fa5961f801ef319314
	DungerMan/Library/metadata/74/74bd539efbad348fd8e6fb3006140d8f
	DungerMan/Library/metadata/77/77fd19e8ec96d40bc83781e645c3b163
	DungerMan/Library/metadata/7a/7a705531ac999457197253b8a2bc5a87
	DungerMan/Library/metadata/81/81c15f01de3954f34aa642d7ecda6221
	DungerMan/Library/metadata/84/8403d3349d112ba4d000be1be39e7c39
	DungerMan/Library/metadata/8b/8bb75655312ab47dcbfa0d3bb8dce8ef
	DungerMan/Library/metadata/93/939865b1dc4a44d9eb6835ff32ea2bf7
	DungerMan/Library/metadata/96/9646b8a42884046d1a7453f1b83b61d5
	DungerMan/Library/metadata/98/98c330f39d11745ad0004adb8d76c639
	DungerMan/Library/metadata/a1/a163989f5c07c429f80ec55fbc6f9635
	DungerMan/Library/metadata/a5/a53cf5449d11a15d1100a04b44295342
	DungerMan/Library/metadata/a6/a629bc6028e1b4126bdda2c8f58ddb3a
	DungerMan/Library/metadata/a8/a8ce6eece896c4baf90727a6cfe71594
	DungerMan/Library/metadata/af/af58e9268b44e49afa8af7bc93eedee3
	DungerMan/Library/metadata/af/afd6289bddf1248ffad347e2d0fc2934
	DungerMan/Library/metadata/b1/b118a33803efd4f10b34ac6a3d32613a
	DungerMan/Library/metadata/c2/c2a526d0278cf4011a08ba23cb712f2d
	DungerMan/Library/metadata/c2/c2ef94ff9d11915d1100a04b44295342
	DungerMan/Library/metadata/c5/c55afdc4a8a3b4890b07cc7d176510bb
	DungerMan/Library/metadata/ce/ce6fadf1538334294b924f7f540a5463
	DungerMan/Library/metadata/ce/ce8d79c79d11b8f9d00076e98d76c639
	DungerMan/Library/metadata/d1/d18990b0a5add4285bb60e4d2cc09de6
	DungerMan/Library/metadata/d1/d1a4fa34240dd4f8fb67e08f159ff8cb
	DungerMan/Library/metadata/d3/d327af052182543b3957d2d73c29f408
	DungerMan/Library/metadata/d8/d83e5f9c887bb480390adb7588e7f363
	DungerMan/Library/metadata/df/df522d59c54314810b91727f1a383837
	DungerMan/Library/metadata/e2/e24b077c82bc84aafa200e12d471aaa2
	DungerMan/Library/metadata/e3/e3da2a8e6ee144aa7b2752f6a98b1e7b
	DungerMan/Library/metadata/fa/fa9d52ecc8e134b9f85c1a8eaacdb337
	DungerMan/Library/metadata/ff/ff79ee57dc77a4ad89e23c0439def264
LOLO