Merge branch 'master' of https://github.com/Widdershin/text-based-adventure into gameplay
Implemented combat and death...by combat
Merge branch 'master' of https://github.com/Widdershin/text-based-adventure into combat
Merge pull request #6 from Widdershin/combat

Combat