Started index handlebars templates
Fixed merge conflict. Ugh.
Update