Merge branch 'master' of https://github.com/michelleoj/edx into michelleoj-master
added a few functions needed to rearrange data
Merge branch 'master' of https://github.com/socho/edx into michelleoj-master

Conflicts:
	grade-distr.html
	grade-distr.js
Merge branch 'master' of https://github.com/socho/edx into michelleoj-master
merged stuff
fixing everything back up
"i was behind, catching up"
Merge branch 'master' of https://github.com/michelleoj/edx
Merge branch 'master' of https://github.com/michelleoj/edx into michelleoj-master

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

Conflicts:
	grade-distr.html
	grade-distr.js