commit-remote in feature-branch-remote
gitgnore file for ds store
commit-remote in master
fixed merge conflict on commit-remote.txt