cart show page finished and halfway through item show
finished item show page
centered review button on order/show, added proceed to checkout on item/show if an item is in the cart, finished review/show page, updated database with user image and fixed FB omniauth to bring in user images, cleaned up user/items show page, brought in user image to profile page, review page and user/items show page
edited item/edit form and user show page for profiles
more changes
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
user profile image to nav bar
Merge branch 'danielle'
Merge branch 'master' of github.com:daniellecs/project_craig
minor format changes with user show page
change price storage in db from dollars to cents, update formatting on several pages
small formatting changes to item search page
fixed minor search bug before experimenting with elasticsearch
more changes
Merge branch 'master' of github.com:daniellecs/project_craig