Edits
Merge branch 'master' of https://github.com/changhoonhahn/tex

Conflicts:
	qfenv_paper/qf_environment.aux
	qfenv_paper/qf_environment.log
	qfenv_paper/qf_environment.pdf
	qfenv_paper/qf_environment.synctex.gz
	qfenv_paper/qf_environment.tex