created an orders view page for admin with a list of all orders and an edit link for each order
fixing up results
table with number of orders by status added to the admin dashboard
viewing an individual order, can view products associated with that order
fixed merge conflict
fixed merge
fixed merge conflicts