Added a readme file
Resolved README.md conflict