Update README.md
Merge remote-tracking branch 'github-pr/pr/3' into incoming

Fix conflicts.