oter on other
other 1
Merge branch 'other'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
	main/nik.txt
after