Add minipage for modelisation_filtre
Merge branch 'master' of http://github.com/anpar/1153
Update slides + rapport
Merge branch 'master' of http://github.com/anpar/1153

Conflicts:
	projet/rapport_prejury/rapport_prejury/rapport_prejury.tex
	projet/slides_prejury/slides_prejury.tex