TJS: Major updates
TJS: Deal with merge
Merge branch 'master' of https://github.com/grsr/python-course