change 2
Merge branch 'master' of https://github.com/langqinren/MyProject

Conflicts:
	Test.txt