Working on template engine
working on templates
Removing metadata folder from repository
Resolving binary merge conflicts