added masonry, captions, and image popup
fixed merge conflicts with timeline