udpated gitignore to (hopefully) ignore .DS_Store
Merge branch 'master' of https://github.com/eriqande/flock-comment