Merge branch 'master' of https://github.com/michelleoj/edx into michelleoj-master
added a few functions needed to rearrange data
Merge pull request #3 from michelleoj/master

adding pip files
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
hopefully this workds
idk what i changed
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
Merge branch 'master' of https://github.com/michelleoj/edx into michelleoj-master

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

Conflicts:
	grade-distr.js
adding pip files