Importation selon le pattern command ok (undo/redo non encore testé)
Merge branch 'master' of github.com:IF-JAJAGA/devoo

Conflicts:
	src/main/java/fr/insaif/jajagaa/control/Controleur.java

Resolution conflit ok