Test3
Merge branch 'master' of https://github.com/Vitaly85/repo1

Conflicts:
	MainFolder.h