Update README.md
Merge pull request #61 from xspider/patch-1

Update README.md
fix conflict