Jekyll import of www.example42.com
Merge branch 'master' into gh-pages