Fixing bad merge
Merge branch 'master' of https://github.com/fataku/rss-reader