added readme
updated readme
Fixing merge conflict