merge
Опять исправил gitignore
Merge with coi-lukinin