Initial commit of files and template directory and files
Merge remote-tracking branch 'origin/master'