Template fixes
Merge pull request #148 from andrewhayward/challenges

Template fixes