closes #275
Merge branch 'master' of github.com:dbltnk/combat-prototype