play btn colors room show
Merge pull request #45 from tidydee/player-functions-user-pg

play btn colors room show
Adding MyRooms, FavouriteRooms, RoomsIPlayIn
Merge pull request #47 from tidydee/feature/public_rooms_my_rooms

Adding MyRooms, FavouriteRooms, RoomsIPlayIn
Remove duplicate migration
Fixing Validations and adding popup on join Rooms
Fixing some more routing issues
Fixing some bugs on RoomsListPopUp
Merge pull request #48 from tidydee/feature/join_a_room_popup

Feature/join a room popup
css beautification
Merge branch 'master' into pre-final-cssing

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #49 from tidydee/pre-final-cssing

css beautification
Merge branch 'master' into fixing_player_in_user_room

Conflicts:
	app/assets/stylesheets/rooms/playlist.css.scss
	app/views/users/index.html.erb