updating
Updating API version
Updates to grader.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	grader.js
	index.html