update Templates
Merge pull request #2 from ChristianMassiveCross/master

Template changes