save useless
Merge branch 'master' of https://github.com/Nexucis/ProjetC

Conflicts:
	dictionnaire.h