add grade assessment feature
Merge branch 'grade-assessment'

remove deleted files in merge conflict