Adds grading report
Merge branch 'master' into gh-pages
Fixes grading report