Merge branch 'master' of https://github.com/AlexGodard/EpreuveSynthese

Conflicts:
	DossierArchitecture.docx