added 2 txt files
fixed readme
fixed the conflicts
Merge pull request #1 from vinitdoshi/master

set the pull request