Update Activity Combat
Merge branch 'master' of https://github.com/clemgaut/ProjetPoo.git