non-random colors
Merge branch 'master' into gh-pages
web