Fixed some inconsistencies with our merging and made it so that the grade now appears in the header of graded assignments.