Updaterat combat.js
Merge branch 'master' of https://github.com/CommanderAlchemy/ProjectHTML-MyEVE