Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
More failed geocoder attempts
Merge pull request #41 from ilanasufrin/ben_branch

Ben branch
Merge pull request #42 from ilanasufrin/emily

prevents all friends from being re-created upon each login
fixes line spacing merge conflict in user model
comments out nonexistant geocoded method on user in user controller