コミットその１
Merge branch 'master' of https://github.com/shiratsu/gitsample

Conflicts:
	sample.txt