joint todo clean up
Merge branch 'master' of https://github.com/pnutus/NHQMReport

Conflicts:
	chapters/berggren.tex