restructure question loop add freetext
Merge pull request #2 from PeterTheOne/dev

restructure question loop and add freetext