final?
Merge branch 'master' of github.com:pnutus/NHQMReport

Conflicts:
	main/report.tex
Merge branch 'master' of github.com:pnutus/NHQMReport