:D :D
Merge branch 'master' of https://github.com/jacobfi/bossen-maig

Conflicts:
	report/ReportTemplate.tex
:D :D