My changes
Merge branch 'master' of https://github.com/filippovdaniil/newkuzbass

Conflicts:
	css/controls.css
	css/style.css