Resolve stash/pull conflict
Merge pull request #5 from alexpaley/master

Handlebar MailApp Template