.
kl
Merge remote-tracking branch 'origin/master'

Conflicts:
	report/report.aux
	report/report.pdf