Updated grader.js
Conflicts resolved