debug quiz function version2
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/controller_quiz.php