Merge pull request #21 from wpreul/master

Using handlebars instead of jade