Update README.md
fix conflic
finished
Merge pull request #3 from RyanTang1988/dev

Finished v1