Changed getQuestions to return a generic list
Merged conflict in ES