updated git ignore
updated files
added tmpl
merged