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
working on user ctrlr
user ctrlr index test pass
user controller create test ok
user controller spec for new started
more user tests, need views
fixed merge conflicts
Merge branch 'users_ctrlr_dy' into development
fixed merge conflicts to dev branch
Merge branch 'development' into room_view