Rapport chérie!
Merge branch 'master' of github.com:Vultrao/ProjetPCV

Conflicts:
	.rapport.tex.swp
	rapport.tex