Added some changes
Worked on the friendships stuff
Merge branch 'master' of github.com:nboneh/final_app