add .DS_Store to gitignore
Merge branch 'master' of github.com:undp/undp.github.com
remove .DS_Store files