Return json or html depending on url
Merge branch 'master' of github.com:aeneaswiener/edtech

Conflicts:
	edtech.py