1.02.2

тест
Merge branch 'master' of https://github.com/Number1788/tutorial

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/Number1788/tutorial

Conflicts:
	.idea/workspace.xml