llllll
lalala
Merge branch 'master' of https://github.com/dimashvets/blog

Conflicts:
	templates/entry.php