add question controller
merge conflict fixed
Merge pull request #10 from catherinev/questions

Questions