blubbed around a bit.
Merge branch 'master' of https://github.com/DoomFire/ClockworkDungeon