resolution conflit
Merge branch 'master' of https://github.com/rgrimmer/graphes
conflit
conflit(2)

Merge branch 'master' of https://github.com/rgrimmer/graphes

Conflicts:
	src/graphe.c
	src/main.c