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

resolves friends not existing in view
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ilana
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
Fix show page conflict, displays friends on show page
Merge pull request #31 from ilanasufrin/ben_branch

Fix show page conflict, displays friends on show page
fixes merge conflicts, restores user show page