not close to finishing friends, pulling down master
Merge branch 'master' of https://github.com/ambreenhasan/cloud-dj into friends-controller
need to merge
some of user routes, one failing test
Merge pull request #8 from ambreenhasan/user-controller

User controller