Merge branch 'clean'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb

1 files changed, 5 insertions, 3 deletions

diff --git a/db/schema.rb b/db/schema.rb
index ca583d1..b0d0766 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140306022702) do
+ActiveRecord::Schema.define(version: 20140306024744) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -122,13 +122,15 @@ ActiveRecord::Schema.define(version: 20140306022702) do
     t.string   "name"
     t.string   "email"
     t.string   "user_name"
-    t.string   "password_digest"
-    t.string   "remember_token"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "password_digest"
+    t.string   "remember_token"
+    t.integer  "groups"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
+  add_index "users", ["remember_token"], name: "index_users_on_remember_token", unique: true
   add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true
 
 end