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

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

Conflicts:
	Sample.txt