Merge branch 'clean2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/tournaments/_form.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/show.html.erb

1 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20140427171600_create_users.rb b/db/migrate/20140427171600_create_users.rb
new file mode 100644
index 0000000..8032870
--- /dev/null
+++ b/db/migrate/20140427171600_create_users.rb
@@ -0,0 +1,13 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :name
+      t.string :email
+      t.string :user_name
+
+      t.timestamps
+    end
+    add_index :users, :email, unique: true
+    add_index :users, :user_name, unique: true
+  end
+end