changes
added lightbox to page_1
override error
override error
resolve merge conflicts
Merge pull request #8 from hoylejanae/new_changes

changes. Woo merge conflicts resolved!