Updated with Aaron's files
Merge pull request #5 from FamousPrivateBeta/Aaron/template-factory

Updated with Aaron's files