ignore test template files
Merge remote-tracking branch 'upstream/master'
forgot to make changes here also
Merge remote-tracking branch 'upstream/master'
Fix logo

missed the www top dir when adding server root
Add rss namespace info

Selfhosted info rather than a blank page on the newznab site
Make rss-info point to rss description for now

will need to actually make a page once the RSS is fixed....
Update changlog
Rss-info

need to change info once feeds are fully operational
Small RSS changes

Add book cover, move size to own attrib. Add nfo attrib
Merge branch 'master' of https://github.com/junkman690/nZEDb into junkman690-master

Conflicts:
	Changelog
cleanup backfill.php
typos
fixed type errors
cleanup
fixed backfiil error in date
gave GrabNZBs its own thread count
added limit to requestID per run
added powerline segment for NNTP connections - ThePeePs
added lines to monitor to show NNTP connections - Mike1
Merge pull request #13 from nZEDb/dev

Dev