initial commit of templates
merging local changes with github