jkj
Merge branch 'master' of https://github.com/muruvig/angelhack

Conflicts:
	__pycache__/sampledata.cpython-34.pyc
	__pycache__/sentscript.cpython-34.pyc
	jsonthingy.py