adding feed and user_feed models, and feeds_controller
adding Add Feed form, as a form_tag
adding logic to create user_feed, hiding add button when already in your feeds, drafting tests
fixing merge conflict