change header on index.ftl.html
fix conflict .gitignore
Merge branch 'chompoo-master'