Problematyczny merdz
Merge branch 'master' of https://github.com/360art/blog-site

Conflicts:
	dist/css/styles.min.css
	dist/js/scripts.js