dat voting
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	public/js/models/partyClient.js
	public/js/views/partyClient.js