Add my templates
Merge branch 'my_template'