Walls and Scales

Walls and Scales!
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/CurrentLayout.dwlt
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/assetDatabase3
	DungerMan/Library/expandedItems
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/04/04b13f8da4f3e497fa11dce2fe83b59f
	DungerMan/Library/metadata/51/518562391f7e446f5a25baf9c4554338
	DungerMan/Library/metadata/b0/b03403faf5f484e409c6e0df2cad86ff
	DungerMan/Library/metadata/b9/b9d00da42c1a14770bd40645c7178564