Merge pull request #4 from ctrovato/master

Pulling EJS and templating files
Merge pull request #5 from ctrovato/egemayel

Merge pull request #4 from ctrovato/master