git ignore
Merge branch 'showProjects'
index.php modified