track breaks, dying etc done
Merge remote-tracking branch 'origin/master'

Conflicts:
	por/__main__.py
	por/cart.py