* I am dev2 and I done a big changes
Merge branch 'dev' of https://github.com/aleksey-pyatlin/git-training into dev

Conflicts:
	test1.txt