now can display all questions and answers on take survey page
fixed merge conflict in index.erb
Merge branch 'master' into make_take_survey_functionality