Update README.md
branch with README changes
README conflict resolved
Merge branch 'readme-edits'