migrated categories in place of tags in FeedUser model
Fixed merge conflict in haml
Added some check to avoid nil errors, commiting incase I need to roll back.
Implemented feature to only display user subscribed feeds. (Modified the views, controller and modelsfor Feed)
Removed the hidden params in sidebar