winer reg & comp
Merge branch 'master' of https://github.com/blegat/LFSAB1507

Conflicts:
	Presentation/Deconvolution/Deconvolution.tex