modified:   app/controllers/feeds_controller.rb

	modified:   app/models/feed.rb