trying to figure out how to use geocoder
fixing merge conflicts
trying to calculate distance
fixing merge conflicts
Merge pull request #47 from ilanasufrin/ben_branch

Ben branch
working on getting distance with emily
resolving merge conflicts
hitting rate limit problems. limited to 30 friends now
Edits to user show page to edit stalking column