added getQuestion
Merge branch 'work'
version