merge templates
Merge pull request #10 from mozilla/merge-templates

merge templates