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

Conflicts:
	launch.launch
	move_base_config/base_local_planner_params.yaml
	move_base_config/move_base.xml
	src/wavefront_frontier_detection.cpp
	view.vcg
for tomorrow