Add line to sample through local repository.
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample.txt