merge problem
Merge branch 'master' of https://github.com/Leph/RobotFitness

Conflicts:
	report/report.tex