さらにさらに変更。
Merge branch 'master' of https://github.com/petitoops/sample

Conflicts:
	sample.txt