Merge conflicts

quiz/views.py

@@ -11,6 +11,7 @@ from . newQuiz import readCSV
 from .models import quiz
 from django.db.models import Max
 from django.shortcuts import redirect
+from .models import result as results
 import csv
 #for login
 from django.contrib.auth.models import User
@@ -63,6 +64,8 @@ def result(request):
                         score-=q[0]['negative']
                     t=submission(questionId=questionInstance, option=request.POST[questionno], studentId=request.user, quizId=quizInstance)
                     t.save()
+            t=results(quizId=quizInstance,studentId=request.user,marks=int(score))
+            t.save()
             return redirect('/view_submission/?q='+str(quizId))
         else:
             return HttpResponse("You have already submitted this quiz")