Trie, Edition, Main
Merge branch 'master' of https://github.com/mxmgilbert/Annuaire

Conflicts:
	bin/annuaire
	src/Personne.cpp
	src/Utils.hpp
	src/main.cpp