added basic info
Merge branch 'master' of https://github.com/socho/edx

Conflicts:
	grade-distr.js