actually port over partyClient to partyPlayer this time
Merge branch 'player'

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