Merge pull request #5 from axce1/master

hot fix
Merge pull request #6 from axce1/master

show message about conflict
Ссылка на rss
Merge branch 'master' of github.com:alrusdi/python-news-digest into locks
Merge branch 'locks' of github.com:alrusdi/python-news-digest into locks
verbose_name для картинки выпуска
исправлена опечатка на главной