merge

app/controllers/application_controller.rb

@@ -204,8 +204,10 @@ class ApplicationController < ActionController::Base
 			User.current = User.find 12
 		end
 
+		# User.current = User.find 81403
+
 		if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
-			User.current = User.find 49610
+			User.current = User.find 81403
 		elsif params[:debug] == 'student'
 			User.current = User.find 8686
 		elsif params[:debug] == 'admin'

app/controllers/challenges_controller.rb

@@ -1,4 +1,5 @@
 class ChallengesController < ApplicationController
+<<<<<<< HEAD
   before_action :require_login, :check_auth
   before_action :find_shixun, only: [:new, :create, :index]
   skip_before_action :verify_authenticity_token, only: [:create, :update, :create_choose_question, :crud_answer]