Merge branch 'master' of git.ukko.mx:psanchezp/quiniela-mundial

@@ -40,6 +40,7 @@ gem 'jbuilder', '~> 2.5'
 
 
 # Use Capistrano for deployment
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 # gem 'capistrano-rails', group: :development
+gem 'slim'
 
 
 group :development, :test do
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

@@ -237,6 +237,7 @@ DEPENDENCIES
   puma (~> 3.0)
   puma (~> 3.0)
   rails (~> 5.0.6)
   rails (~> 5.0.6)
   sass-rails (~> 5.0)
   sass-rails (~> 5.0)
+  slim
   spring
   spring
   spring-watcher-listen (~> 2.0.0)
   spring-watcher-listen (~> 2.0.0)
   turbolinks (~> 5)
   turbolinks (~> 5)

@@ -15,7 +15,7 @@ ActiveRecord::Schema.define(version: 20180608221342) do
   # These are extensions that must be enabled in order to support this database
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "plpgsql"
 
 
-  create_table "bet", force: :cascade do |t|
+  create_table "bets", force: :cascade do |t|
     t.integer "match_id",    null: false
     t.integer "match_id",    null: false
     t.integer "user_id",     null: false
     t.integer "user_id",     null: false
     t.integer "score_local", null: false
     t.integer "score_local", null: false
@@ -42,7 +42,7 @@ ActiveRecord::Schema.define(version: 20180608221342) do
     t.index ["deleted_at"], name: "index_heimdall_engine_roles_on_deleted_at", using: :btree
     t.index ["deleted_at"], name: "index_heimdall_engine_roles_on_deleted_at", using: :btree
   end
   end
 
 
-  create_table "match", force: :cascade do |t|
+  create_table "matches", force: :cascade do |t|
     t.string  "local",       null: false
     t.string  "local",       null: false
     t.string  "visit",       null: false
     t.string  "visit",       null: false
     t.date    "date",        null: false
     t.date    "date",        null: false
@@ -52,7 +52,7 @@ ActiveRecord::Schema.define(version: 20180608221342) do
     t.integer "pool_id",     null: false
     t.integer "pool_id",     null: false
   end
   end
 
 
-  create_table "pool", force: :cascade do |t|
+  create_table "pools", force: :cascade do |t|
     t.string   "name",           null: false
     t.string   "name",           null: false
     t.datetime "editable_until", null: false
     t.datetime "editable_until", null: false
     t.boolean  "active"
     t.boolean  "active"