Merge branch 'master' into Paul

doc/sprint-3/README.md

doc/sprint-3/radiateur.jpg

src/main/Affichage.java

src/main/Deplacement.java

src/main/Interface.java

src/main/Main.java

src/main/Region.java

src/main/Scan.java

src/main/Type.java

src/units/Archer.java

src/units/Chevalier.java

src/units/Combattre.java

src/units/Eclaireur.java

src/units/Paysant.java

src/units/Unite.java

test/units/CombatreTest.java