Add row 3
Merge branch 'master' of https://github.com/T-Miyauchi/tutorial

Conflicts:
	sample.txt