Merge remote-tracking branch 'origin/cat' into rmf
Dungen fixups
Merge remote-tracking branch 'origin/cat' into rmf

Conflicts:
	NotShit/Program.cs
Not completely crappy dungen.
Merge remote-tracking branch 'origin/cat' into rmf

Conflicts:
	NotShit/NotShit.csproj
	NotShit/Program.cs
Oops
Made Player a mob, basic attack stuff.
Merge branch 'rmf' of github.com:rmartinho/tglgj2 into cat

Conflicts:
	NotShit/Program.cs