working on friend requests
Merge branch 'master' of github.com:elenavillamil/CollaborativeProject