Add new file from feature1 branch
Merge branch 'feature1'