conflict
hw
Merge branch 'master' of
https://github.com/mironovaOlga/python-basics.git

Conflicts:
	practice_1/olga.py
Merge pull request #18 from mironovaOlga/master

pull request