conflicting commit
delete process completed
Merge branch 'master' of https://github.com/TeamProjectHSE/sirotenko-jiharev-tohtamuradova