working on spotify player
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	public/js/views/partyPlayer.js
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	public/js/views/partyPlayer.js
some spotify player work
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	assets/js/views/partyPlayer.coffee
	public/js/views/partyPlayer.js