HumanFactors
Merge branch 'origin/master'

Conflicts:
	Report/Kilder/Anders.bib.bak
Merge branch 'origin/master'