orth
Merge branch 'master' of https://github.com/arthaud/GRO

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