Added a function to merge data from the union of a photoDB object and a photo in the AlbumDB
Merge branch 'master' of https://github.com/bsanders/softeng