MAJ pdf 4pages
Merge branch 'master' of github.com:id13/tp_robots

Conflicts:
	rapport/template.tex
c'est mon commit