all meaningful code removed - only boilerplate now
a new line as a commit example
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages