test acces-control-allow-origin
Merge remote-tracking branch 'origin/master'

Conflicts:
	Groep3Cria/test.html