test4

test4
Merge remote-tracking branch 'origin/master' into branch

Conflicts:
	README.md
Merge pull request #3 from a-sakaguchi/branch

test4