Replace master branch with page content via GitHub
Solving merge conflict between master and gh-pages
Merge branch 'master' into gh-pages