README updated
Last things
Merge conflict