commit
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	Reader/.classpath
	Reader/Pekka_Feeds.txt