add new line to feature3
Merge branch 'master' of https://github.com/idewz/git_training_with_conflicts

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