récup
Merge branch 'master' of https://github.com/lahaut/memoire-DLA

Conflicts:
	document_final.aux
	document_final.log
	document_final.pdf
	document_final.toc
retouches et annexes