progress bar in users and room
bug fixed
fixing bug, player and REFACTORING CODE
Resolve Conflicts
Merge pull request #37 from tidydee/fixing_player_bug_in_user_room

Fixing player bug in user room
Merge branch 'master' of github.com:tidydee/sound_room into layout/more-css-spruce

Conflicts:
	app/views/layouts/application.html.erb
	app/views/rooms/show.html.erb