test
Merge branch 'master' of github.com:nenew12/git_training_with_conflicts