minor insignificant changes
Merge branch 'master' of https://github.com/mzhong21/scrapbook
Added image uploading, changed settings to include PROJECT_ROOT and STATIC_ROOT