added question logic
resolved merge conflict with logic.js