Premerge alignment
Merge branch 'master' of https://github.com/cassiemoy/survey_gorilla_group_project into dylan
Other mods to user sign-in and logout processes
premerge align
Merge Conflict Fix
Add Edit Survey Page Format Basics
Merge pull request #22 from cassiemoy/user_profile_page

Other mods to user sign-in and logout processes
Merge pull request #23 from cassiemoy/dylan

Dylan
Edit Buttons Add
Merge pull request #24 from cassiemoy/dylan

Edit Buttons Add
Add link to Survey Results
updated seed file
Merge pull request #26 from cassiemoy/david

updated seed file
Merge pull request #25 from cassiemoy/dylan

Add link to Survey Results
Minor merge conflicts fixed