just fooling around
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
Merge pull request #23 from ilanasufrin/ben_branch

Ben branch
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
working on user show page
Merge pull request #24 from ilanasufrin/ilana

Ilana
trying to get the view to display things
Merge pull request #25 from ilanasufrin/ilana

trying to get the view to display things
Sets up core cron job functionality via the whenever gem