newbranch changes in master file
merged newbranch commits