Merge branch 'client3'

Conflicts:
	MyTestFile.txt