orders, oi and product relationships
fixed merge conflicts
Merge branch 'master' of github.com:lizrush/congo into orders
changed routes, progress on orders and order items
kerri's work
edited order table with status
cart shows items, heck yeah
adds quantity field on cart page
migrate category table
work on images
merge master into pics branch
Merge pull request #24 from lizrush/pics

Pics
fixed resizer
changes with new bugs in users
merge
latest layout and still broken signin