no message
Merge branch 'master' of https://github.com/nikmei/MyTestProj

Conflicts:
	TestThisFile.txt