added test.php
modified readme
fixing merge conflict