nettoyage
Merge branch 'master' of https://github.com/florestan/vivi

Conflicts:
	rapport(flo).tex