last rewrite pt9
Merge branch 'master' of https://github.com/oxr/hdtt230712

Conflicts:
	p2i.tex
	prop6July.tex