robot ambiguous distance
Merge branch 'master' of https://github.com/rmtsukuru/Hackathon-Foodstuffs

Conflicts:
	app/controllers/map_test_controller.rb