l
k
Merge remote-tracking branch 'origin/master'

Conflicts:
	13_02324_F13/D4/funktionalitet/Funktionalitet2.java