yolo
trying to switch branches
need to merge
added kareem's photo upload branch
merged conflicts
Added New Products & Fixed Product Categories
Added Product photos to seed data
manually merged changes
manually merged conflicts
updated views w/ carousel and images
pushing for view review
Fixed wire glasses and professor issue
Debugging issues
cleaned up controllers
ready for views to be reviewed
just pulled down remote branch
merge conflicts
shit's working now
shit's still working...