cm2
Merge branch 'master' of https://github.com/olga-jane/test

Conflicts:
	MyLoginInGit.txt