Adding c.txt
Merge branch 'feature1'
Adding d.txt
Editing d.txt