Merge branch 'tim'

Conflicts:
	Makefile
Merge branch 'master' into yzq

Conflicts:
	Makefile
	main.bib