Reorganize controller. Colors work.
Merge branch 'master' of github.com:samgreen/everybody-draw-stuff