Revert "Revert "Merge branch 'master' of https://github.com/Cfretz244/PHP-RSS""

This reverts commit e0972f76dca675ad7b526b22fd5356501fc34fc2.
cleaned up after fucked up merge