Show page fixes
Fixes merge conflicts
Fixes session user persistence
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
Merge pull request #33 from ilanasufrin/ben_branch

Ben branch