typo theorem 6.6

also some other stuff that's not finished yet
attempt to merge

Conflicts:
	deformation.tex