Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
change

changed a comment so I could try to push to gh-pages
Merge branch 'gh-pages'
added a credit