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

Conflicts:

qfenv_paper/fig_qf_cylr2h25_thresh75_bin0_25_primuszerr-eps-converted-to
.pdf
	qfenv_paper/fig_qf_cylr2h25_thresh75_bin0_25_primuszerr.eps
	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
conflicts