copyright edits
Merge branch 'gh-pages'
test
test
Merge branch 'master' into gh-pages