Fix user migration
Commit before update.
Fix merge conflict.
Merge pull request #15 from cassiemoy/dylan

Remove Extra Helper
question partials
Merge branch 'christian' of https://github.com/cassiemoy/survey_gorilla_group_project into christian
Merge pull request #16 from cassiemoy/christian

Christian
Create button for add a question.
Merge pull request #17 from cassiemoy/create_survey

Create survey
Pre-merge Commit
Merge branch 'master' of https://github.com/cassiemoy/survey_gorilla_group_project into dylan
User Model Update