more work on proof
Merge branch 'master'

Conflicts:
	preamble.tex