Add logging
Merge branch 'master' of heroku.com:txti

Conflicts:
	txti.py

Add formulas
Merge branch 'master' of github.com:unhaltable/txti