Adding a file with my name
Merge branch 'feature1'