test
test
Merge origin/master

Conflicts:
	src/main/java/com/rssnotifier/RSSNotifier.java