started handlebars
resolved merge conflict in index.html