test commit
Merge branch 'origin/master'

Conflicts:
	QHE/main.aux
	QHE/main.log
	QHE/main.pdf
	QHE/main.synctex.gz
	QHE/main.tex (reverted from commit 7b86b136a46aa45503939fa8a5b8b0fd00decc34)
Merge branch 'origin/master'