templates implemented
Merge resolved.
Merge pull request #15 from theocean154/templatetime

templates implemented