Revert "moved help to a separate method, added fight loop (may need changed later)"

This reverts commit 797903608706bb3661bd2429185c69e5f37c842f.
merge attempt II, electric boogaloo

My eclipse still won't prompt me when I make any syntax errors, so
hopefully this update is mostly error-free.  Anyway, will try and have
my eclipse pull itself together etc...
Merge branch 'Geoffs_WIP'
Fixed the room printing multiple asterisks
Merge branch 'master' into Geoffs_WIP