got the code working again
Merge branch 'master' of https://github.com/michelleoj/edx into michelleoj-master

Conflicts:
	grade-distr.js
Merge branch 'michelleoj-master'

Conflicts:
	grade-distr.js