Updated readme
Merge conflict solved