prepping for merge
added gitignore DS_store