Update slides and report
Merge branch 'master' of github.com:palkeo/projet-jee

Conflicts:
	rapport/rapport.pdf
	rapport/rapport.tex
	rapport/slides.pdf