Merge branch 'gh-pages'
Blockquote instead of h1
Merge branch 'master' into gh-pages