to force confl
Merge branch 'master' of https://github.com/SergeyVolodich/training

Conflicts:
	README.md