fix order of markup
Merge branch 'gh-pages'