starting to add email notifications for un-approved gd records
merge reso
Merge branch 'master' of github.com:marichards/media-db
adding orig.settings.py
conflict reso
trivial change to whitespace in urls.py
Merge branch 'master' of github.com:marichards/media-db
Merge branch 'master' of github.com:marichards/media-db