Merge pull request #32 from Rutherther/combat Add combat extension
fix(combat): remove trailing whitespace
feat(combat): add combat manager