edit local_settings.py.template
merge conflict
Merge pull request #5 from rgschneider/jon-feature

Jon feature
user authentication, done view
Merge branch 'develop' of https://github.com/rgschneider/group-project-base into johanna_feature
click handling for help and done button
working on modals...unsuccessfully
Merge pull request #6 from rgschneider/johanna_feature

Johanna feature
fixed url conflict
Merge pull request #7 from rgschneider/Molly-feature

working on modals...unsuccessfully
regex for button titles