Add ds_store to gitignore
Merge branch 'master' of github.com:cwatkins/ocproject