Lalalalala
Merge branch 'master' of http://github.com/senilica/LostVaults

Conflicts:
	src/lostvaults/server/Dungeon.scala