test fail des tapettes
Merge branch 'master' of https://github.com/CesiExiaAdriThibJerem/ProjetJavaGitHup

Conflicts:
	src/configuration/Main.java