adding file 2 for feature 2
some changes
new file 3 for feature new
local master modification