Modification pour la confiance
Merge branch 'master' of https://github.com/Stolr/Tp_Collecticiel.git

Conflicts:
	sources/src/stolr/graphstream/test/GraphFacebook.java
	sources/src/stolr/graphstream/test/ParserFileMutual.java