added feature3 anouncement
added feature3 anouncement
Merge branch 'feature3' of github.com:Natthapong/git_training_with_conflicts into feature3