ilana gets nearby friend locator working!
Merge pull request #48 from ilanasufrin/emily

ilana gets nearby friend locator working!
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
got distance working
fixed merge conflicts
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
Merge branch 'ben_branch' of github.com:ilanasufrin/friendStalker
we have checkboxes under each user
working with ben to get checkboxes for stalking
changed id to class
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
still working
possibly working
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
last commit before heading home
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
adds phone number to edit page
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
Adds notes for presentation