- use templating
Merge branch 'master' into template
Merge pull request #10 from zackhsi/template

Templating