Switching to bibtex
Merge branch 'bib'

Conflicts:
	shanghai.tex