music player incorporated in the rooms
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