adding feature b file
Merge branch 'master' of local repository into feature-b