Revert "1234"

This reverts commit 02472b5c33b66b1db5e381cc904de87457d37441.
Merge branch 'master' of https://github.com/muruvig/angelhack

Conflicts:
	scripts/sentscript.py