end of class week 3
Merge branch 'master' of https://github.com/cypret/python_learning