Ignore DS_Store files on mac
Merge remote-tracking branch 'upstream/master'
Merge pull request #32 from xuy/master

Merged with upstream master, added DS_Store to .gitignore.