Fix user migration
Remove Extra Helper
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
Merge branch 'master' of https://github.com/cassiemoy/survey_gorilla_group_project into create_survey
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
changed routing for sessions in the user controller to match forms in index view
Merge branch 'master' of https://github.com/cassiemoy/survey_gorilla_group_project into create_survey
Merge pull request #19 from cassiemoy/dylan

Dylan
Merge pull request #20 from cassiemoy/derek

changed routing for sessions in the user controller to match forms in in...
Add questions controller.
Fix merge conflict.