Merge branch 'master' into gh-pages
updates to line colors and data
Merge branch 'gh-pages'