New Template created
Merge branch 'master' of https://github.com/technomicssolutions/emplome
New controller added
Conflict resolved