Edit ReadMe
Merge pull request #2 from dshener/readme-B

Edit ReadMe
fix readme conflict