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