test for conflict
Merge branch 'master' of https://github.com/Vincent-Wu/tutorial

Conflicts:
	sample.txt
resolve conflict