Update Makefile
Merge branch 'master' into yzq

Conflicts:
	Makefile
	main.bib