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

Conflicts:
	practice_1/olga.py
Merge remote-tracking branch 'original-repo/master'
# __init__.py
# andrey.txt
# hash_my_name.py
# 
# filipovski
# AyratSaubanov
1
Merge pull request #18 from mironovaOlga/master

pull request
Materials link.
Merge branch 'master' of https://github.com/filipovskii/python-basics.git
Assertions practice
Merge branch 'practice/assertions' into develop
Dividers practice
Merge branch 'practice/dividers' into develop
Booleans practice
Conflist resolving
Assertion functions update
Conflict resolving
Console output update
'Duplicates' home work