Pre-merge Commit
Merge branch 'master' of https://github.com/cassiemoy/survey_gorilla_group_project into dylan
User Model Update
Merge pull request #19 from cassiemoy/dylan

Dylan