testing
still writing python code, simple testing... Merge branch 'master' of https://github.com/socho/edx

Conflicts:
	edx-data-formatter.js