fix conflicts
Merge branch 'dev' of https://github.com/tohakotliarenko/personality into dev

Conflicts:
	templates/personality/css/template.css