Merge remote-tracking branch 'origin/master'

Conflicts:
	HeiFredrik

Nytt dok hei2.txt