Add xxx
Merge branch 'master' of https://github.com/iNutBaaa/git_training_with_conflicts