Merge pull request #1 from rgschneider/Molly-feature

Molly feature
Amazon setup
Merge branch 'master' of https://github.com/rgschneider/group-project-base into johanna_feature
update authentication config in settings
update local_settings.py template
Delete local_settings.py.template

just got a mail from amazon, our keys obviously shouldn't be public
Merge pull request #2 from rgschneider/johanna_feature

Amazon
working on modals...unsuccessfully