Merge branch 'Geoffs_WIP'
fixed movement methods within the map class

OUUUUU
Fixed typos, spelling errors

also some jokes
Changed the fight code to be at the top of the loop, text fixes
Turned map objects to private, text fixes
Enemies die, map updates correctly
Reason for not accepting command other than fight
Player can die
Typos, player can really die now, credits roll
Merge conflicts
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP