Aded grader.js
Merge branch 'master' of heroku.com:frozen-brook-2211

Conflicts:
	grader.js