modified README.md
conflict test
Merge pull request #1 from YoshikiEguchi/new_branch

Updated README.md