q
Merge branch 'master' of https://github.com/netruxa/helloWorld2

Conflicts:
	test.php