commit from tutorial
Merge branch 'master' of https://github.com/kaishitaeiichi/tutorial

Conflicts:
	sample.txt