Merge branch 'clean4'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/static.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/static_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/game.rb
	app/models/user.rb
	app/views/games/index.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/routes.rb
	generate.sh

1 files changed, 0 insertions, 8 deletions

diff --git a/generate.bat b/generate.bat
deleted file mode 100644
index ae6a3e4..0000000
--- a/generate.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-
-bundle exec rails generate scaffold server
-bundle exec rails generate scaffold tournament
-bundle exec rails generate scaffold match
-bundle exec rails generate scaffold team
-bundle exec rails generate scaffold user
-bundle exec rake db:drop RAILS_ENV=development
-bundle exec rake db:migrate RAILS_ENV=development