SmallBugFix

Fixes bug where you get hit by unfinished attack of dead character.
Merge branch 'master' of https://github.com/slanger/RPG