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

Conflicts:
	sample.txt
Merge pull request #2 from rei-m/pullreq2

ぷるりく2の変更