created readme file
changed the conflicts
Merge pull request #1 from sneha-bharti/master

get the file