fefe
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/CurrentLayout.dwlt