commit from laptop
Merge remote-tracking branch 'origin/master'

Conflicts:
	HovedOpgave/HovedOpgave.v12.suo
	HovedOpgave/Webservice/bin/Webservice.dll
	HovedOpgave/Webservice/bin/Webservice.pdb
	HovedOpgave/Webservice/obj/Debug/Webservice.dll