removed conflict file
Merge branch 'toledofeeds'
Merge branch 'toledofeeds'
Changed mysql to mysqli in index.php
fixed link to files