Removed grade up to distinction

Fixed the issue reported by haakym  about the incorrect text for P6/7. Changed the grading so it no longer "grades up" to Distinction if the student has met all criteria.