Updating template files
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol