foo
fixed merge
Added stuff to play songs
Merge branch 'master' of https://github.com/simonlast/popcorn-music

Conflicts:
	.DS_Store
	client/client.js
	public/.DS_Store
	server/add-music.js