added .DS_Store files
fixed merge conflict
Deleted slide show