pulling in master changes
adding gitignore for .ds_store files
pulling in changes of adding gitignore ds store files from dev branch