intricate div changes on user show page
more user show page styling, started to fix review system
fixed merge conflicts
deleted one line from orders.css
 fixed a merge conflict