kon ik nog uploaden
Merge remote-tracking branch 'origin/master'

Conflicts:
	Concurrency-opdracht-3/Properties/AssemblyInfo.cs