messing around with templates
Merge pull request #1 from moliri/master

messing around with templates