pour debloquer
Merge branch 'master' of https://github.com/maxdestors/SimuGenerator.git

Conflicts:
	config/config1.fml