add feature3
Merge branch 'master' of github.com:iNutBaaa/git_training_with_conflicts