some more changes
Merge branch 'master' of https://github.com/ntoskrnl/cardiomood-kolomna

Conflicts:
	site/.idea/workspace.xml
Merge branch 'master' of https://github.com/ntoskrnl/cardiomood-kolomna

Conflicts:
	site/.idea/workspace.xml
Merge branch 'master' of https://github.com/ntoskrnl/cardiomood-kolomna

Conflicts:
	site/.idea/workspace.xml