Better working stuff
Merge branch 'master' of https://github.com/himat/TutorMe