Merge branch 'djikstra'

Conflicts:
	src/devoo/h4301/model/Itineraire.java