merge
Merge branch 'master' of https://github.com/useti/RSS_Bot

Conflicts:
	.idea/workspace.xml
	src/rssReader/Main.java