Combat closer to working
Merge branch 'master' of https://github.com/felesmortis/QSQ