コミットまで
Merge branch 'master' of https://github.com/rtanote/sandbox

Conflicts:
	sample.txt