even more working code
Merge branch 'master' of https://github.com/lamson/tutoring