New citations
blanton edits
Merge branch 'master' of https://github.com/changhoonhahn/tex

Conflicts:
	qfenv_paper/qf_environment.tex