playlist view
Merge branch 'master' of https://github.com/cszarapka/eece_381