Edited index.php from desktop
Merged changes