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, 1 insertions, 1 deletions

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index b0692d8..cbd46a7 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -1 +1 @@
-@import "bootstrap";
\ No newline at end of file
+@import "bootstrap";