Refactor

As all points from the epic refactor issue are closed #47 (closed) I am merging this in to master in order to unblock development.

backend/core/serializers.py

@@ -2,7 +2,6 @@ from rest_framework import serializers
 from core.models import Student, Submission, Feedback, ExamType
 
 from core.models import Feedback, Student, Submission
-=======
 from rest_framework import serializers
 from core.models import Student, Submission, Feedback, ExamType
 
@@ -11,7 +10,6 @@ class ExamSerializer(serializers.ModelSerializer):
     class Meta:
         model = ExamType
         fields = ('module_reference', 'total_score', 'pass_score', 'pass_only',)
->>>>>>> First step towards REST + Vue Student Page
 
 
 class FeedbackSerializer(serializers.ModelSerializer):