went back to basics on combat
Merge branch 'master' of https://github.com/trifork3/Qbit