Fix test bug
Merge branch 'master' of https://github.com/Hexanome4202/test_devoo.git

Conflicts:
	src/test/ControleurTest.java