a delete
Merge branch 'master' of https://github.com/nico97118/projet_graphe

Conflicts:
	graphe.cpp
	graphe.h