Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Innlevering2/Innlevering2/Innlevering2/bin/x86/Debug/Innlevering2.pdb
	Innlevering2/Innlevering2/Innlevering2/obj/x86/Debug/Innlevering2.csproj.FileListAbsolute.txt
	Innlevering2/Innlevering2/Innlevering2/obj/x86/Debug/Innlevering2.exe
	Innlevering2/Innlevering2/Innlevering2/obj/x86/Debug/Innlevering2.pdb
	Innlevering2/Innlevering2/Innlevering2Content/obj/x86/Debug/Innlevering2Content.contentproj.FileListAbsolute.txt