add .DS_Store to gitignore
Merge branch 'master' of github.com:vogon/words