cccc
rech
okMerge branch 'master' of https://github.com/laurinehu/dijkstra

Conflicts:
	binary_heap.o
	binary_search_tree.o
	dijkstra
	dijkstra.o
	liste_ad.o
	listechainee.c
	listechainee.o
	main.o
	tab.o