Bøsse
Merge branch 'origin/master'

Conflicts:
	Report/Kilder/kilder.bib.bak