next feature
Merge pull request #2 from henkkerckhoffs/next_feature

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

Conflicts:
	test.php