リリース1.0
release1.1
Merge branch 'release-1.1'

Conflicts:
	sample.txt