Style update
Merge branch 'master' of https://github.com/cavedweller/massplay

Conflicts:
	client/index.html