4
Merge branch 'master' of https://github.com/huygapro/TestGit

Conflicts:
	Test.txt