Conflict test
Merge branch 'master' of https://github.com/KelvinLai/tutorial

Conflicts:
	sample.txt