..
Merge branch 'master' of https://github.com/tpepels/graphslam2

Conflicts:
	src/graph.h