adding new templates
Merge branch 'master' of https://github.com/JonahStanley/DjangoSpike