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

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

pull request
Assersions: equal, not equal, true, false
Test function and divider string
Assertions: is, is not, none, not none
Signed-off-by: yakovkoshkin <yakov.koshkin@gmail.com>
Assertions: in, not in

Signed-off-by: yakovkoshkin <yakov.koshkin@gmail.com>
Dividers: new file and empty function