changement inutiles ...
Merge branch 'master' of github.com:V3ner/Projet_S2

Conflicts:
	Projet_JAVA/Workspace eclipse/.metadata/.log
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RING/.markers
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RING/org.eclipse.jdt.core/state.dat
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	Projet_JAVA/Workspace eclipse/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	Projet_JAVA/Workspace eclipse/RING/src/combat/Combat.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/Combattant.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/Guerrier.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/Attaque.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/Bouclier.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/Epee.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/Parade.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/Remede.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/Soin.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/SortDeffensif.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/SortGuerriseur.java
	Projet_JAVA/Workspace eclipse/RING/src/combattant/capacite/SortOffensif.java
	Projet_JAVA/Workspace eclipse/RING/src/ihm/Fenetre.java
	Projet_JAVA/Workspace eclipse/RING/src/ihm/Main.java
	Projet_JAVA/Workspace eclipse/RING/src/sauvegarde/Sauvegarde.java
Modif des combats