third commit for merge
Merge branch 'master' of github.com:shuyuy/test

Conflicts:
	sample.txt