Massere af matematik
Merge remote-tracking branch 'origin/master'

Conflicts:
	løsning/endelige_program.c