ignore .DS_Store on osx
Merge branch 'master' of github.com:benwei/jschat