Merge branch 'show-youtube' of github.com:vden/pepyatka into vden-show-youtube

Conflicts:
	public/css/morda.css