Translated all static pages to Django templates
Get up to sync with Jake.

Merge branch 'master' of https://github.com/mzhong21/scrapbook
Resolving merge conflicts