Merge branch 'master' of https://github.com/mirelvt/website

Conflicts:
	build/css/base.css
	public/css/base.css