all spotify stuff gone... how could u hurt me like this spotify...
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	public/js/views/partyClient.js