Combat seems to be working correctly now
created a roomDescription generator and fixed so that stats is updated in GUI
Merge branch 'master' of http://github.com/senilica/LostVaults

Conflicts:
	src/lostvaults/tests/RoomTest.scala