questions and choices are createdddddd
Merge branch 'master' into new_survey
Merge pull request #35 from nairys/new_survey

new surveys are functional
Resolved JS and View merge issues