modified:   src/main/java/fr/insaif/jajagaa/model/Dijkstra.java
Merge branch 'master' of github.com:IF-JAJAGA/devoo

ok
Merge branch 'master' of github.com:IF-JAJAGA/devoo

Conflicts:
	src/main/java/fr/insaif/jajagaa/model/Dijkstra.java

ok