some changes
Merge branch 'master' of https://github.com/sadpants/P3-Rapport

Conflicts:
	Content/Conclusion/FutureWork.tex