Made it so that template paths are dynamically created
Merge remote-tracking branch 'origin/master'