design commit
design commit 2
После кота убрать текстовку
Merge remote-tracking branch 'remotes/origin/design'

Conflicts:
	.idea/workspace.xml