Debug
Merge branch 'master' of https://github.com/Azerom/hanjie

Conflicts:
	fichiers.c
	historique.log