picking it up again...
Merge branch 'master' of https://github.com/wgminer/ng-music

Conflicts:
	app/scripts/controllers/playlist.js