add DS_STORE to gitignore
Merge branch 'master' of https://github.com/chrislgarry/osc