switching branches
finally made client id token work with soundcloud api
created room template and soundcloud controller
Merge branch 'development' into angular-controllers-and-views-aa
got angular to send params at sign up
merge conflicts fixed
Merge pull request #25 from ambreenhasan/angular-controllers-and-views-aa

Angular controllers and views aa