adding commit merge text gile
Merge branch 'feature-branch-merge'
adding pic forgot to gitignore ds store