Premerge alignment
Merge branch 'master' of https://github.com/cassiemoy/survey_gorilla_group_project into dylan
premerge align
Merge Conflict Fix
Add Edit Survey Page Format Basics
Merge pull request #23 from cassiemoy/dylan

Dylan