ЛК
Merge branch 'master' of https://github.com/Nekrasovnetut/sherlockweb

Conflicts:
	assets/css/style.css
Merge branch 'master' of https://github.com/Nekrasovnetut/sherlockweb