bounded changes
Merge branch 'bounded_stuff'

Conflicts:
	shanghai.tex