Commit before update.
Fix merge conflict.
Create button for add a question.
Merge pull request #17 from cassiemoy/create_survey

Create survey