added frienships and worked on profile page
Merge branch 'master' of github.com:danbzly/omrails