improved filenames and added draft of feeds#index
Merge branch 'master' into backend
Added categories and descriptions to feeds
Merge pull request #17 from chorus-frogs-2014/backend

Backend