modifs
Merge branch 'master' of github.com:OpenLamas/Projet_OpenStack

Conflicts:
	docs/Rapport/rapport.tex
suite