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

Conflicts:
	main.c
tableau ok, dijskra a faire