Update README.md
Update readme
Commit before merge.
Fix merge conflicts.