a lot of formatting updates, add masonry to all major image results pages
conflict fixes
fixed merge conflicts
add seed data for user images
Merge branch 'master' of github.com:daniellecs/project_craig
fixed user images for seed data and changed formtting slightly
Merge branch 'danielle'
Merge branch 'master' of github.com:daniellecs/project_craig
fixed minor search bug before experimenting with elasticsearch