First Working version
Merge remote-tracking branch 'origin/master' into mshkolnyi

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml

Nothing changed
Merge remote-tracking branch 'origin/master' into mshkolnyi

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml

Nothing changed
Merge remote-tracking branch 'origin/master' into mshkolnyi

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml

Nothing changed
Merge remote-tracking branch 'origin/master' into mshkolnyi

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml

Nothing changed