Merge branch 'master' of https://github.com/jeanbalayrac/Projet_MDI343

Conflicts:
	rapport/MDI_343_Projet.pdf
	rapport/MDI_343_Projet.synctex.gz
test_pdf
maj rapport