playlist view changes
Merge branch 'master' of https://github.com/conradhappeliv/musicHackathon

Conflicts:
	views/playlist.jade