poke
Merge branch 'master' of http://github.com/Freyj/Projet2Dico

Conflicts:
	hashage1.cpp

merge de la branche