templates made better
Merge branch 'master' of https://github.com/Jrende/IV1201