3rd commit
Merge branch 'master' of https://github.com/karadaharu/tutorial

Conflicts:
	sample.txt