change
Merge branch 'master' of https://github.com/gitgituser/tutorial

Conflicts:
	sample2.txt