modif fichier constant
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/fr/unice/deptinfo/simu_generator/App.java
Merge branch 'master' of https://github.com/maxdestors/SimuGenerator