Merge branch 'master' into luke

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/tournaments_controller.rb

1 files changed, 10 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 113f16d..30ac1af 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: 20140403155049) do
+ActiveRecord::Schema.define(version: 20140403171427) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -129,6 +129,15 @@ ActiveRecord::Schema.define(version: 20140403155049) do
   add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true
   add_index "sessions", ["user_id"], name: "index_sessions_on_user_id"
 
+  create_table "simple_captcha_data", force: true do |t|
+    t.string   "key",        limit: 40
+    t.string   "value",      limit: 6
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "simple_captcha_data", ["key"], name: "idx_key"
+
   create_table "teams", force: true do |t|
     t.integer  "match_id"
     t.datetime "created_at"