fixed bug when shuffling answers
Merge branch 'master' into dante