mybranch v1
v1 日本語
v2 P
Merge branch 'master' into mybranch

Conflicts:
	README.md