Add contacts
Add index.php new line from contacts branch
Resolve merge conflict