Profile half hooked up
Merge branch 'master' of https://github.com/nicki9knuckles/paralist

Conflicts:
	public/index.html
	public/js/controllers/playlist.js