Changing some margin notes
Merge branch 'master' of github.com:CliftonCunningham/geometrization-tori

Conflicts:
	shanghai.tex
Working on functoriality