Rewrite the html structure and syntax chapter
Rebuild
Merge master into gh-pages