résolution de conflit main

doc/sprint-3/README.md

doc/sprint-4/README.md

doc/sprint-4/radiateur.jpg

doc/sprint-5/README.md

doc/sprint-5/radiateur.jpg

src/events/FortEvent.java

src/events/TeleportationEvent.java

src/items/Crown.java

src/items/Items.java

src/main/Case.java

src/main/Event.java

src/main/Main.java

src/main/Region.java

src/units/Archer.java

src/units/Chevalier.java

src/units/Eclaireur.java

src/units/Paysant.java

src/units/Unite.java