pants
Merge branch 'master' of https://github.com/DoomFire/ClockworkDungeon

Conflicts:
	items/armors/lowerklok/pants.png
I think I might've saved that in the wrong place...

oh well
Merge branch 'master' of https://github.com/DoomFire/ClockworkDungeon