New index template
Merge conflict in style.css