Commit 3
Merge branch 'master' of https://github.com/KelvinLai/GitTest

Conflicts:
	Sample.txt