modified:   src/initial.c
	modified:   src/journaliste.c
Merge branch 'master' of https://github.com/Chocobozzz/projet-systeme

Conflicts:
	src/initial.c
	src/journaliste.c