edited test.php
rewrite dev of test.php
master and dev have been merged