new commit by nikita
merge
gitignore add
bug fix
forgetin files