ignore .DS_Store
Update README.md
Merge branch 'master' into socket