Readme changed
Readme conflict solved