Added then and now text to photos, added polaroid frame to now photo and polariod frame navigation item, refactored setOverlay to be in pictureAddition, called setTextOverlay, resolved merge conflicts.