Merge remote-tracking branch 'origin/gh-pages'
Main pages set up with semantic HTML
Merge remote-tracking branch 'origin/master' into gh-pages