test 3
Merge branch 'master' of https://github.com/pdlchrono13/projet.git

Conflicts:
	chrono13/src/ihm/test.java