Set the README file for master branch
Merge Conflict resolution
Merge branch 'master' into gh-pages