add basic dungeon functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	town.cpp
	town.h