file2 is added
file1 is edited in feature
file4 is added
Merge pull request #1 from snehashah224/feature

merging