Creating and Adding to playlists user stories.
Merge branch 'master' of github.com:ECSE428Group/media-stream

Conflicts:
	media-site/client/audio.js
	media-site/client/main.js