Ignoring stupid .DS_Store files
Merge branch 'master' of github.com:wwchen/sw-matcha