2
Merge branch 'master' of https://github.com/corink/origin

Conflicts:
	sample.txt