initial commit
added to templates
Merge branch 'added_templates'