adding .DS_store to .gitignore
Merge branch 'cg.stage' into cg.dev

merging update to .gitignore from stage to dev