la
Merge branch 'master' of github.com:arnef/se3

Conflicts:
	G6_B09_2mallien2brinkho1feil.rkt
cite funktion