added feature3 anouncement
feature2
Merge branch 'master' of github.com:roongr2k7/git_training_with_conflicts