toegangscontrolle
Merge branch 'master' of https://github.com/PTS22S25B/Proftaak

Conflicts:
	test/test.suo
	test/test/Site1.Master
	test/test/WebForm1.aspx
	test/test/bin/test.dll
	test/test/bin/test.pdb
	test/test/css/bootstrap.min.css
	test/test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	test/test/obj/Debug/test.dll
	test/test/obj/Debug/test.pdb