for tomorrow
Merge branch 'master' of https://github.com/tpepels/slam_navigation

Conflicts:
	src/turtlebot_navigator.cpp