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

Conflicts:
	CMakeLists.txt