juste pour pull, no modif
Merge branch 'master' of https://github.com/laurinehu/dijkstra

Conflicts:
	dijkstra.c
	main.c
Merge branch 'master' of https://github.com/laurinehu/dijkstra

Conflicts:
	main.c