Merge pull request #8 from bullcitydave/templates

Templates