Changed to safe merging mode
Merge branch 'master' of github.com:b123400/butai2