Sørens commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	chapters/content/kravspecifikation.tex
Merge branch 'master' of https://github.com/SW3-P3/LaTeX