résolution de conflits main encore...

.settings/org.eclipse.core.resources.prefs

.settings/org.eclipse.core.runtime.prefs

doc/sprint-5/README.md

doc/sprint-6/README.md

doc/sprint-6/radiateur.jpg

src/items/Crown.java

src/items/Items.java

src/main/Case.java

src/main/Main.java

src/main/Plateau.java

src/main/Region.java

src/main/Type.java

src/units/Paysant.java

src/units/Unite.java