no message
Merge branch 'master2' of https://github.com/thp13123/MyTestRepo into master2

Conflicts:
	File1.txt