Merge branch 'clean'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/show.json.jbuilder
	db/migrate/20140306014123_add_index_to_users_email.rb
	db/migrate/20140306014125_add_index_to_users_user_name.rb
	db/migrate/20140306014128_add_password_digest_to_users.rb
	db/migrate/20140306014130_add_remember_token_to_users.rb
	db/schema.rb

1 files changed, 3 insertions, 4 deletions

diff --git a/db/schema.rb b/db/schema.rb
index f2e9136..ca583d1 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: 20140306014132) do
+ActiveRecord::Schema.define(version: 20140306022702) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -122,14 +122,13 @@ ActiveRecord::Schema.define(version: 20140306014132) do
     t.string   "name"
     t.string   "email"
     t.string   "user_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
     t.string   "password_digest"
     t.string   "remember_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["remember_token"], name: "index_users_on_remember_token"
   add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true
 
 end