??
weet niet wat dit is
Merge branch 'master' of https://github.com/PTS22S25B/Proftaak

Conflicts:
	Toegangscontrole/Toegangscontrole/Toegangscontrole.suo

	Toegangscontrole/Toegangscontrole/Toegangscontrole/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	test/test.suo
	test/test/bin/test.dll
	test/test/bin/test.pdb
	test/test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	test/test/obj/Debug/test.dll
	test/test/obj/Debug/test.pdb