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

Conflicts:
	binary_heap.c
	binary_heap.h
	dijkstra.c
	listechainee.c
	main.c
	system.h
	tab.c
	tab.h