add line from test2
Merge branch 'master' of https://github.com/yamazaki/test

Conflicts:
	sample.txt