Test 2
Merge branch 'master' of https://github.com/Stanley-Zhao/HelloWorld

Conflicts:
	Test-TortoiseGit.txt.txt