Merge branch 'master' into Geoffs_WIP
print boss room description before the fight

otherwise you would never see it
Merge branch 'Geoffs_WIP'