petit cheat pour facilite les test
Merge branch 'master' of https://github.com/V3ner/Projet_S2

Conflicts:
	Projet_S2/Projet_JAVA/Workspace
eclipse/RING/src/combattant/capacite/Capacite.java