Merge branch 'master'
изменение gitignore
Merge branch 'model'