updated .gitignore
index.php is updated
index.php is updated
fx merge conflict .gitignore