Merge branch 'patch-1' into 'master'

Update grading_and_final_evaluation_2018.md

See merge request !1
2 jobs for master in 5 minutes and 4 seconds