EJS templating logic in place
Merge branch 'template'