Edits, mainly to section 5
Edits, mainly to section 6
Edits, mainly to section 7
A few edits to section 8
Edits, mostly in section 8
Merge branch 'master' of github.com:CliftonCunningham/geometrization-tori

Conflicts:
	shanghai.tex
Edits, to section 8