some more stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/client.js
	public/player.html