bib
Merge branch 'master' of github.com:mikeshulman/basictex

Conflicts:
	all.bib