Merge branch 'master' into gh-pages
styling playlists
Merge branch 'gh-pages'