Minor fixes... again
Merge branch 'master' of github.com:mikkelam/D502e13

Conflicts:
	report/content/introduction.tex