you'll see
Merge branch 'master' of http://github.com/mglover/shoebox

Conflicts:
	shoebox.py