Des bugs on ralenti l'avancée, fin prevu ct"aprem
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projet_JAVA/Workspace eclipse/RING/src/combattant/Combattant.java
	Projet_JAVA/Workspace eclipse/RING/src/ihm/PannelCombatPrincipal.java