Calculates distance
Calculates distance
Merge branch 'master' of https://github.com/kevstessens/sugerime

Conflicts:
	app/controllers/home_controller.rb