git is making me do this
Merge branch 'master' of https://github.com/Charliebarton/EmmaHack1
template changes