addFeature commit

this is the second branch modify
Merge branch 'addFeatures'
Merge branch 'master' into addFeatures
this is thirdFile Commit
this is addFeatures modify
Merge branch 'addFeatures2' into addFeatures
Merge branch 'addFeatures'