bah un peu de tout
Merge branch 'master' of https://github.com/blegat/LFSAB1507

Conflicts:
	matlab/blurmetric.m
	report/ComplementaryTreatment/ComplementaryTreatment.tex