Update feature2.txt
Merge branch 'master' of https://github.com/idewz/git_training_with_conflicts