reglement des conflits
Merge branch 'master' of https://github.com/Nexucis/ProjetC
save de dico.c
Merge branch 'master' of https://github.com/Nexucis/ProjetC

Conflicts:
	dictionnaire.c
Merge branch 'master' of https://github.com/Nexucis/ProjetC
Merge branch 'master' of https://github.com/Nexucis/ProjetC
save totale
Merge branch 'master' of https://github.com/Nexucis/ProjetC

Conflicts:
	dictionnaire.c
	main.c
Merge branch 'master' of https://github.com/Nexucis/ProjetC