バグ修正
Merge branch 'topicks'

Conflicts:
	sample.txt