Merge pull request #4 from ctrovato/master

Pulling EJS and templating files