test method
add test method
Merge branch 'newBranch'

Conflicts:
	php/test.php