add .gitignore and remove .ds_store
Merge branch 'master' of github.com:tstapleton/cbm