trying to figure out how to use geocoder
fixing merge conflicts
trying to calculate distance
fixing merge conflicts
Removes subscriptions table, adds stalking column to friendships, adds stalking conditional to friends show page
Merge pull request #46 from ilanasufrin/emily

Emily
Merges conflict in friend model
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
ilana gets nearby friend locator working!