Ignore OS X hidden file DS_Store
Merge branch 'master' of https://github.com/michaelchum/code-snippets

Merge .gitignore
Merge branch 'master' of https://github.com/michaelchum/code-snippets

Merged .gitignore