ぷるりく３の変更
Merge pull request #3 from rei-m/pullreq3

ぷるりく３の変更
Merge branch 'master' into pullreq2

Conflicts:
	sample.txt