Combat updated
I'm not sure what I've cchanged here"
Merge branch 'master' of https://github.com/CM1101Group8/game