3rd commit
Merge branch 'master' of https://github.com/Djiro/gitTut

Conflicts:
	sample.txt