Merge branch 'gh-pages'
working!
Merge branch 'color-picker'
Merge branch 'master' into gh-pages