ny endring
Merge branch 'master' into nybranch

Conflicts:
	fil_i_knut_sin_branch