test
Merge branch 'master' of
https://ALouis38@github.com/ALouis38/projetfinalmiagel3.git

Conflicts:
	src/generationmodule/Generateur.java