deleted index3.php
merged dev