Merge branch 'clean'

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/sessions/new.html.erb
	config/routes.rb

1 files changed, 9 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 494fb09..f2e9136 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: 20140304043700) do
+ActiveRecord::Schema.define(version: 20140306014132) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -72,6 +72,14 @@ ActiveRecord::Schema.define(version: 20140304043700) do
     t.datetime "updated_at"
   end
 
+  create_table "sessions", force: true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "sessions", ["user_id"], name: "index_sessions_on_user_id"
+
   create_table "team_match_pairs", force: true do |t|
     t.integer  "team_id"
     t.integer  "match_id"