merge experiments
merged
Merge branch 'master' of https://github.com/esiqveland/prosjektoppgave

Conflicts:
	rapport/experiments/experiments.tex