plan
Merge remote-tracking branch 'origin/master'

Conflicts:
	[Gardette - Reminy] Memoire.docx