プルリクエスト3
pullrequest
Merge branch 'master' into feature/test

Conflicts:
	textA.txt
Merge pull request #9 from miho10/feature/test

プルリクエスト3