built two views and controller for questions_controller
fixed merge conflicts