Merge branch 'master' of https://github.com/BruSD/NewsRssFeed

Conflicts:
	.idea/modules.xml
	.idea/workspace.xml