Merge commit 'a20bd0d' into balance_ideas

Conflicts:
	balance/balance.py
Merge branch 'balance_ideas' of github.com:bjmgeek/icfp2006 into balance_ideas

Conflicts:
	balance/balance.py