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

Conflicts:
	TestProject/doc.txt