other feature
Merge branch 'master' of https://github.com/henkkerckhoffs/henktest.git
into otherfeature

Conflicts:
	test.php
Merge pull request #3 from henkkerckhoffs/otherfeature

other feature