Finalisation du rapport
Merge branch 'master' of https://github.com/sidewinder94/booXstore

Conflicts:
	Livrables/Rapport/Développement.tex
Merge branch 'master' of https://github.com/sidewinder94/booXstore

Conflicts:
	Livrables/Rapport/Développement.tex
Merge branch 'master' of https://github.com/sidewinder94/booXstore