deleted log.txt
clean up test.php
Merge branch 'master' of https://github.com/ngming/test