Merge pull request #1 from mrkm/feature/test

modify README.md
modify README.md
modify README.md
Conflicts: README.md, merged manualy.
add hoge
add hoge on master branch
hoge
delete hoge
manualy merge
manualy merge (hellp)