Chargement du fichier de config dans un ArrayList
Merge branch 'master' of https://github.com/maxdestors/SimuGenerator.git

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