Fixed order of branch and made the teacher dialog stretchable
Merge pull request #23 from jammm/master

Fixed order of branch and made the teacher dialog stretchable