Combat stuff
Merge branch 'master' of https://github.com/CKovacs/JnRProject