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