Merge pull request #31 from ilanasufrin/ben_branch

Fix show page conflict, displays friends on show page
fixes merge conflicts, restores user show page
Merge pull request #32 from ilanasufrin/emily

fixes merge conflicts, restores user show page
Show page fixes
Fixes merge conflicts