changed message when there are no questions
Merge branch 'master' of ssh://github.com/mcuringa/py-tutor
making conflicts...
Merge branch 'master' of ssh://github.com/mcuringa/py-tutor