deleted test folder, now we just have spec folder
removed stray period from users_controller file
Merge pull request #11 from ambreenhasan/testing_fixes

Testing fixes
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
starting development branch
created stylesheets folder
css now working. added application.css file and such
cleaned it up a little
working on user ctrlr
scss
Merge branch 'development' of https://github.com/ambreenhasan/cloud-dj into room_view
user ctrlr index test pass
user controller create test ok
user controller spec for new started
Merge pull request #13 from ambreenhasan/room_view

Room view
got sass working and deleted unnessisary files
api key controller added to development