added a new file from feature1 branch
created a new master file to master
Merge branch 'feature1'