Merge pull request #37 from ilanasufrin/ben_branch

Fixes merge conflicts
Persists friend objects in db and user show page