Created filter by category function. Changed feeds controller to render categories with feeds association.
Refactored filter function and listener for category and feed.
Resolved merge conflict in categories.js