color/player chooser
Merge branch 'master' of github.com:cmyk-game/cmyk

Conflicts:
	index.js