Merge branch 'clean2'

Conflicts:
	app/controllers/alerts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/models/match.rb
	app/models/team.rb
	app/models/tournament.rb
	app/views/sessions/_form.html.erb
	app/views/sessions/index.html.erb
	app/views/sessions/index.json.jbuilder
	app/views/sessions/show.html.erb
	app/views/sessions/show.json.jbuilder
	app/views/tournaments/index.html.erb
	config/routes.rb
	generate.sh

1 files changed, 10 insertions, 0 deletions

diff --git a/bin/autoindent b/bin/autoindent
new file mode 100755
index 0000000..c45da1e
--- /dev/null
+++ b/bin/autoindent
@@ -0,0 +1,10 @@
+#!/bin/bash
+file=$1
+sed -i 's/^\s*//' "$file"
+emacs --batch "$file" \
+	--eval '(setq indent-tabs-mode t)' \
+	--eval '(setq ruby-indent-level 4)' \
+	--eval '(setq tab-width 4)' \
+	--eval '(setq make-backup-files nil)' \
+	--eval '(indent-region (point-min) (point-max) nil)' \
+	-f save-buffer