Made game playable
Included files I forgot
Merge branch 'master' of https://github.com/Widdershin/text-based-adventure into gameplay
Implemented combat and death...by combat
Merge pull request #5 from Widdershin/gameplay

Gameplay
Merge branch 'master' of https://github.com/Widdershin/text-based-adventure into combat
Merge pull request #6 from Widdershin/combat

Combat
merged master into room_setup