Comming readme file
Commit README file
corrected merge conflict