文字修正2
Merge branch 'master' of https://github.com/naoyawatanabe/git_practice into branch3

Conflicts:
	README.md
Merge pull request #4 from naoyawatanabe/branch3

Branch3