modified:   inc/main.h
	modified:   src/archiviste.c
Merge branch 'master' of https://github.com/Chocobozzz/projet-systeme