Fixing merge
Merge branch 'master' of https://github.com/CliftonCunningham/geometrization-tori

Conflicts:
	shanghai.tex