Code used for localization demo
Merge branch 'localization'

Conflicts:
	src/make_a_map.cpp