Color testing

black on grey/white
Merge branch 'master' into gh-pages