master2

Conflicts:
	sample.txt