QuestionsController complete
fixed merge conflicts