Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
add comment

git says it is merged but new data not there.
Merge branch 'gh-pages'
removed comment

hmm now gh-pages are six ahead. Odd. They've been merged all night. So
this is taking the comment out to hopefully merge data.