templating
Merge branch 'master' of github.com:duner/redesigNU14