seed data added
fixed conflicts
adding placeholder images
resizing upload photos