こっちでも追記

衝突するはず
Merge branch 'master' of github.com:matsuhisa/github_test

Conflicts:
	README.md