Merge pull request #20 from tidydee/layout/clean-up

clean up room show
player
Fixing NoCurrentUser Bug on Rooms page
Merge pull request #21 from tidydee/bugfix/no_currentuser

Fixing NoCurrentUser Bug on Rooms page
last
First Commit
Adding Remove/Add + Color Change on Button Click
Adding Remove to Button
Fixing name error. Data now display on page refresh-Still need to refresh Page with AJAX
Adding song_id as a DATA tAg in the Dom on Save. Still little Wonky and needs testing. Next step is to pass that value to my URL and attempt a DELETE post to DB
Adding and Deleting from DB_BREAKTHROUGH!!! :)
music player incorporated in the rooms
Add/Remove works, but not on Page Refresh
Add/Remove works! Uses scID to delete from DB.
Add/Remove both works on page refresh and Non-Refresh
Merge pull request #22 from tidydee/feature/remove_button_on_sclist

Feature/remove button on sclist
Merge branch 'master' into adding_player_to_rooms

Conflicts:
	app/views/rooms/show.html.erb
Merge pull request #23 from tidydee/adding_player_to_rooms

music player incorporated in the rooms
Merge branch 'master' into layout/clean-up

Conflicts:
	app/assets/stylesheets/rooms.css.scss
	app/views/rooms/show.html.erb