broadcast colorState
Merge branch 'master' of github.com:0i0/mayorshow

Conflicts:
	app.js
	views/home.jade