mon afternoon
Merge branch 'master' into usersdelete
Merge branch 'master' into usersdelete
Merge branch 'master' into usersdelete
updated application.html.erb
Merge branch 'master' of https://github.com/JavaRabbit/UselessJunk
working on CSS
Merge branch 'master' of https://github.com/JavaRabbit/UselessJunk
fixed route path
copied my_orders html into new branch
addes my_orders method to users_controller
added my_orders path
Merge branch 'master' into userorders
changed has_many from orderitems to order_items
organizes orders on the my_orders page
shows total revenue at top of my orders page, using format_money
updated category/product relationship
button in form to add category
adds total number of orders per status in my orders page
started filter order buttons