Create README.md
Merge remote-tracking branch 'origin/master'

Conflicts: README.md