Merge pull request #27 from ilanasufrin/ben_branch

Ben branch
resolves friends not existing in view
Merge pull request #28 from ilanasufrin/emily

resolves friends not existing in view
Cleans up user show page