Commit conflict rubbish removed.
Merge branch 'gh-pages'