sample から更新
Merge branch 'master' of https://github.com/kanayay/sample

Conflicts:
	sample1.txt