Removed some old files
Started working on trending
Merge remote-tracking branch 'origin/master'