Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch
Gets to the friends page with friends on first load, but doesn't persist from page to page
Merge pull request #36 from ilanasufrin/ben_branch

Ben branch