some size and color twiddle
Merge branch 'master' into gh-pages