Django template

Merging in the completed project to the master branch.