conflicts
Merge branch 'gh-pages' to have the gh-pages files incorporated back
into master