ds store
got slideshow working
fixed merge conflicts
fixed merge conflicts