First pass on Photo
Merge from master (album)
Photo loop working
Merge pull request #2 from marktabler/photo

Photo