make this my own page
Merge branch 'master' into gh-pages
'changing some HTML in the gh-pages branch'