this is 3rd commit from local
commit 3rd from local
Merge branch 'serverfix' of https://github.com/gitJetRambo/TestRepository into serverfix

Conflicts:
	TestProject/doc.txt
3rd local merge