changement dans combat.java
Merge branch 'master' of http://github.com/V3ner/Projet_S2