commit
Merge branch 'master' of https://github.com/Fant0m771/meningit_deploy

Conflicts:
	themes/custom/meningitis/css/global.styles.css
	themes/custom/meningitis/sass/global.styles.scss
delete cashe
part1