routine commit
Merge branch 'master' of https://github.com/Cfretz244/PHP-RSS

Conflicts:
	UpdateDB.php