Noeud à livrer
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo

Conflicts:
	src/main/java/fr/insaif/jajagaa/App.java
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo