Merge pull request #5 from vonclites/dusty

Dusty
Merge branch 'dusty'
Merged in from Dusty
Fixed small bug related to user staying in room after they logout and formatting of look command
Merge pull request #7 from vonclites/connor

Fixed small bug related to user staying in room after they logout and fo...
Started working on combat.  Need to fix death.