cleaned up naming convention
license update
ga bacon
switched to paint chip swatches instead of circles
Merge remote-tracking branch 'origin/master' into gh-pages