fixed merge conflicts on show page
had to add ds store files to continue
fixed merged conflict
fixed merge conflicts
got the carousel actually working. make sure that you have at least 4 photos to display for the carousel version
added all the owl plugins
Merge pull request #37 from bobolinks-2014/update-show-css

Update show css