Merge branch 'master' into gh-pages
Replace <aside> with <nav>
Merge branch 'gh-pages'