template changes
Merge branch 'master' of https://github.com/projectTeam32/ClassProject