Merge pull request #1 from RyanTang1988/dev

update README.md
Update README.md
fix conflic