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

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 8d65960..ba6ab16 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -14,7 +14,6 @@ class MatchesController < ApplicationController
 
 	# GET /matches/new
 	def new
-
 	end
 
 	# GET /matches/1/edit
@@ -54,10 +53,10 @@ class MatchesController < ApplicationController
 	# DELETE /matches/1
 	# DELETE /matches/1.json
 	def destroy
-
 		@match.destroy
 		respond_to do |format|
 			format.html { redirect_to tournament_matches_path }
+			format.json { head :no_content }
 		end
 	end
 
@@ -70,6 +69,7 @@ class MatchesController < ApplicationController
 	def set_tournament
 		@tournament = Tournament.find(params[:tournament_id])
 	end
+
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def match_params
 		params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id)