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
made some css changes
Merge branch 'master' of https://github.com/JavaRabbit/UselessJunk
fixed merge conflicts
finished item display
Merge pull request #38 from JavaRabbit/userorders

Userorders
Made squares for index page
Merge branch 'master' of https://github.com/JavaRabbit/UselessJunk
fixed merge conflict
Merge pull request #39 from JavaRabbit/usersdelete

Usersdelete
added authorization to order show page, changed cart to orders/cart