aanpassingen 2
Merge branch 'master' of https://github.com/sparkybag/sparkytest

Conflicts:
	test.php