rectification combat
 désolé pour commit all mais là ca bug ...
Merge branch 'master' of http://github.com/V3ner/Projet_S2

Conflicts:
	Projet_S2/Projet_JAVA/Workspace eclipse/RING/nbproject/project.properties