merged with master
choice can be edited and deleted
merging with master
Merge pull request #10 from kiopelani/create_question_and_choice

Edit and delete choice
Merge branch 'master' into ariana
added users