insert feature 2 code
Merge branch 'master' of github.com:aziza4/git.branch.merge.demo into r2_feature2
add some notes to r2-feature2 branch