Group answers in question form
Merge pull request #2 from colchambers/wip6584

Group answers in question form #6584