Make index.html >> index.liquid w template
Merge branch 'dev'