third commit
Merge branch 'master' of https://github.com/warped-man-em/tutorial

Conflicts:
	sample.txt