cap 3.1
Merge branch 'master' of https://github.com/ieatmosquitos/bearingslam

Conflicts:
	latex/report_bearingslam.log
	latex/report_bearingslam.pdf