espaces lignes
Merge remote-tracking branch 'origin/master'

Conflicts:
	rapport4/tache4.tex