meetup distance complete
Merge branch 'master' of github.com:FrenchBully/chatchat

Conflicts:
	app/models/user.rb
	config/routes.rb