delete Gemfile.lock
ignore Gemfile.lock
Merge branch 'master' into stack
classificator settings