Update README.md
another conflict
Merge pull request #3 from Qinsmoon/master

another conflict