Added lightbox gallery and media sections
Fixed conflicts
Fixed media link and grossly oversized images
Fixed Conflicts