Update .gitignore
Merge pull request #334 from angelxmoreno/patch-1

Update .gitignore to not include .DS_Store
Merge branch 'refs/heads/master' into develop