working on friends activity
Merge branch 'master' of github.com:elenavillamil/CollaborativeProject