update gems
concluding merge
johnny changes
fixed merge conflicts
linking albums to photos