minor changes in users controller
catching up to master
Merge branch 'master' of https://github.com/ambreenhasan/cloud-dj into usr_cont
catching up to master
Merge pull request #12 from ambreenhasan/usr_cont

Usr cont