small bug fix
Merge branch 'master' of github.com:daniellecs/project_craig
almost done with the img search results page - image formatting is tough
intricate div changes on user show page
mostly conflict fixes, some small search page fixes
more user show page styling, started to fix review system
fixed merge conflicts
deleted one line from orders.css
 fixed a merge conflict
Merge branch 'master' into chelsea