obligen ferdig

da er obligen ferdig gjort og, tror det er noen oppgaver fra mads her i
denne syncen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Workshop/.metadata/.log

	Workshop/.metadata/.plugins/org.eclipse.core.resources/.projects/Obligatrisk
innlevering 1/.indexes/e4/history.index
	Workshop/.metadata/.plugins/org.eclipse.core.resources/.projects/Skole
mappe/.indexes/e4/history.index
	Workshop/.metadata/.plugins/org.eclipse.core.resources/.projects/Skole
mappe/.markers
	Workshop/.metadata/.plugins/org.eclipse.core.resources/.projects/Skole
mappe/.markers.snap
	Workshop/.metadata/.plugins/org.eclipse.core.resources/.projects/Skole
mappe/.syncinfo.snap
	Workshop/.metadata/.plugins/org.eclipse.core.resources/.projects/Skole
mappe/org.eclipse.jdt.core/state.dat

	Workshop/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	Workshop/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Workshop/.metadata/.plugins/org.eclipse.core.resources/.snap
	Workshop/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Workshop/.metadata/.plugins/org.eclipse.jdt.core/4100829022.index
	Workshop/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

	Workshop/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat

	Workshop/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	Workshop/.metadata/version.ini