Exploration locale
Merge branch 'master' of https://github.com/Leph/RobotFitness
Explore Location
Conflicts:
	report/report.tex