Updated Templates
Merge pull request #33 from chrishumboldt/dev-chris

Updated Templates