update with changes from Production branch

db/migrate/20101210151518_add_status_to_feeds.rb

@@ -0,0 +1,9 @@
+class AddStatusToFeeds < ActiveRecord::Migration
+  def self.up
+		add_column :feeds, :status, :string
+  end
+
+  def self.down
+		remove_column :feeds, :status
+  end
+end