yo
Merge branch 'master' of https://github.com/laurinehu/dijkstra

Conflicts:
	binary_heap.o
	dijkstra
percolate up ok
freeMerge branch 'master' of https://github.com/laurinehu/dijkstra

Conflicts:
	dijkstra
	dijkstra.o
	liste_ad.o
	listechainee.o
	main.o