first try
Merge remote-tracking branch 'origin/master'

Conflicts:
	Lesson1.py
first try