"merging conflicts"
Merge branch 'master' of https://github.com/mehdif/OptimodLyon.git

Conflicts:
	src/controleur/Application.java
tst