Merge pull request #24 from ilanasufrin/ilana

Ilana
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
Merge pull request #25 from ilanasufrin/ilana

trying to get the view to display things
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
Sets up core cron job functionality via the whenever gem
Merge pull request #26 from ilanasufrin/ben_branch

Sets up core cron job functionality via the whenever gem
Renames custom rake task file, changes test cron job to every 300 minutes instead of ever minute
Adds extra seed data user with nil for location, some work on user show page
Merge pull request #27 from ilanasufrin/ben_branch

Ben branch
resolves friends not existing in view
Merge pull request #28 from ilanasufrin/emily

resolves friends not existing in view
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
fixes nav bug to recognize session and display links accordingly
Merge pull request #29 from ilanasufrin/emily

fixes nav bug to recognize session and display links accordingly
Cleans up user show page
no significant changes. just messing around
Fix merge conflict
Merge pull request #30 from ilanasufrin/ben_branch

Ben branch
merge conflicts
still fixing merge conflicts