about to push up to heroku
added marker
Removed thumb method
Removed thumb method
commented out some photos
added default images
Merge branch 'master' into development
seed images with carrierwave
Merge branch 'development' of github.com:ninasridhar/project_2 into development
Merge branch 'development' into seed_images
Merge branch 'development' of github.com:ninasridhar/project_2 into accordion_category
some small changes