templates
Merge pull request #2 from jward14/master

templates