Fixed a merge conflict with RSS feeds line commenting.
Marek Kuziel <marek@kuziel.info>- provided the start up of the project and fixes to Darryl's code.Darryl Cousins <darryljcousins@gmail.com>- keeps throwing chunks of code at the project to the demands of Tim.- is responsible for the mess and lack of tests