master
Sergey G. Rykovanov
Add python script
Add conflict.txt
Merge pull request 'Запрос на слияние из feature/new в master' (#5) from feature/new into master
Add test2.txt (certain feature)
Add squash example