changes from iMac
Merge branch 'master' of https://github.com/photoindra/lessons

Conflicts:
	week01/week_01_04.py