Combat manager
Merge pull request #29 from jbauschatz/combat

Combat manager