merge conflicts on .DS_Store
merge conflict to .DS_Store fixed. And added to .gitignore
edited ProjectPlan