switching branches
didn't work
finally made client id token work with soundcloud api
created room template and soundcloud controller
fixed room_invite migration so that it connects to users and added accepted col
Merge branch 'development' into angular-controllers-and-views-aa
tested and finished roominvite controller
fixed merge, wont merge with origin
fixed cov bullshit haivng to do with merge conflicts
Merge pull request #24 from ambreenhasan/room-invite-control

Room invite control
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
meh
fixed loading issue
merge conflicts happen way too often
deleting stray api key things heheheheh
index works with test
created sound cloud controller"
created soundcloud route