New templates
Merge pull request #3 from andrekw/master

New templates