intermediate photo developments
Images on product show page. Will replace generic hippo with seed images.
added column in User#show Order history table to show # of items in order
rspecs
Fixed merge conflicts
fixed missing 'end'
merge conflict with master