Typo
Merge branch 'master' of github.com:ProjetPP/Papers

Conflicts:
	FinalReport/datamodel.tex