Added README file.
Fixed merge conflict with README files