working on slideshow, photos should be finished.
Merge pull request #3 from csmoseley/chris

working on slideshow, photos should be finished.