.

Conflicts:
	Laborationer/Laboration 1.md