ds store
got slideshow working
fixed merge conflicts
working towards more calendar functionality
fixed merge conflicts
commits changed