with neil
Merge branch 'master' of https://github.com/oxr/hdtt230712

Conflicts:
	proposal.tex