Merge pull request #4 from dpschaaf/Collage

Albums in progress, database associations for photos-album
Merge branch 'master' into photo_parsing
Added photos to show at presentation