merge test
Merge branch 'master' of https://github.com/u-kudox/tutorial

Conflicts:
	sample.txt